Making includes absolute, part 6: better filenames for internal files.

As we are now using absolute includes, there is no need to prefix everything with "magnum<Namespace>" etc. All generated configuration files are renamed to configure.h and their path is included _before_ everything else to avoid accidental collisions.
13 years ago · 7a68362170
142 changed files with 161 additions and 166 deletions
--- a/modules/FindMagnum.cmake
+++ b/modules/FindMagnum.cmake
@ -133,7 +133,7 @@ find_path(MAGNUM_INCLUDE_DIR
    NAMES Magnum/Magnum.h)

 # Configuration
-file(READ ${MAGNUM_INCLUDE_DIR}/Magnum/magnumConfigure.h _magnumConfigure)
+file(READ ${MAGNUM_INCLUDE_DIR}/Magnum/configure.h _magnumConfigure)

 string(FIND "${_magnumConfigure}" "#define MAGNUM_BUILD_DEPRECATED" _BUILD_DEPRECATED)
 if(NOT _BUILD_DEPRECATED EQUAL -1)
--- a/src/Magnum/AbstractImage.h
+++ b/src/Magnum/AbstractImage.h
@ -31,7 +31,7 @@
 #include <cstddef>

 #include "Magnum/Magnum.h"
-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"

 namespace Magnum {

--- a/src/Magnum/AbstractObject.h
+++ b/src/Magnum/AbstractObject.h
@ -32,7 +32,7 @@

 #include "Magnum/OpenGL.h"
 #include "Magnum/Types.h"
-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"

 namespace Magnum {

--- a/src/Magnum/AbstractShaderProgram.h
+++ b/src/Magnum/AbstractShaderProgram.h
@ -33,7 +33,6 @@

 #include "Magnum/AbstractObject.h"
 #include "Magnum/Magnum.h"
-#include "Magnum/magnumVisibility.h"

 namespace Magnum {

--- a/src/Magnum/Audio/Buffer.h
+++ b/src/Magnum/Audio/Buffer.h
@ -33,7 +33,7 @@
 #include <Corrade/Containers/Array.h>

 #include "Magnum/Magnum.h"
-#include "Magnum/Audio/magnumAudioVisibility.h"
+#include "Magnum/Audio/visibility.h"

 namespace Magnum { namespace Audio {

--- a/src/Magnum/Audio/CMakeLists.txt
+++ b/src/Magnum/Audio/CMakeLists.txt
@ -42,7 +42,7 @@ set(MagnumAudio_HEADERS
    Renderer.h
    Source.h

-    magnumAudioVisibility.h)
+    visibility.h)

 add_library(MagnumAudio ${SHARED_OR_STATIC} ${MagnumAudio_SOURCES})
 target_link_libraries(MagnumAudio ${CORRADE_PLUGINMANAGER_LIBRARIES} ${OPENAL_LIBRARY})
--- a/src/Magnum/Audio/Context.h
+++ b/src/Magnum/Audio/Context.h
@ -31,7 +31,7 @@
 #include <string>
 #include <al.h>

-#include "Magnum/Audio/magnumAudioVisibility.h"
+#include "Magnum/Audio/visibility.h"

 #ifndef DOXYGEN_GENERATING_OUTPUT
 typedef struct ALCdevice_struct ALCdevice;
--- a/src/Magnum/Audio/Renderer.h
+++ b/src/Magnum/Audio/Renderer.h
@ -31,7 +31,7 @@
 #include <al.h>

 #include "Magnum/Magnum.h"
-#include "Magnum/Audio/magnumAudioVisibility.h"
+#include "Magnum/Audio/visibility.h"
 #include "Magnum/Math/Vector3.h"

 namespace Magnum { namespace Audio {
--- a/src/Magnum/Audio/Source.h
+++ b/src/Magnum/Audio/Source.h
@ -34,7 +34,7 @@

 #include "Magnum/Magnum.h"
 #include "Magnum/Audio/Audio.h"
-#include "Magnum/Audio/magnumAudioVisibility.h"
+#include "Magnum/Audio/visibility.h"
 #include "Magnum/Math/Vector3.h"

 namespace Magnum { namespace Audio {
--- a/src/Magnum/Audio/Test/AbstractImporterTest.cpp
+++ b/src/Magnum/Audio/Test/AbstractImporterTest.cpp
@ -28,7 +28,7 @@

 #include "Magnum/Audio/AbstractImporter.h"

-#include "testConfigure.h"
+#include "configure.h"

 namespace Magnum { namespace Audio { namespace Test {

--- a/src/Magnum/Audio/Test/CMakeLists.txt
+++ b/src/Magnum/Audio/Test/CMakeLists.txt
@ -22,10 +22,10 @@
 #   DEALINGS IN THE SOFTWARE.
 #

-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/testConfigure.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/configure.h)

-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})

 corrade_add_test(AudioAbstractImporterTest AbstractImporterTest.cpp LIBRARIES MagnumAudio)
 corrade_add_test(AudioBufferTest BufferTest.cpp LIBRARIES MagnumAudio)
--- a/src/Magnum/Audio/Test/testConfigure.h.cmake
+++ b/src/Magnum/Audio/Test/testConfigure.h.cmake
--- a/src/Magnum/Audio/magnumAudioVisibility.h
+++ b/src/Magnum/Audio/magnumAudioVisibility.h
@ -1,5 +1,5 @@
-#ifndef Magnum_Audio_magnumAudioVisibility_h
-#define Magnum_Audio_magnumAudioVisibility_h
+#ifndef Magnum_Audio_visibility_h
+#define Magnum_Audio_visibility_h
 /*
    This file is part of Magnum.

@ -26,7 +26,7 @@

 #include <Corrade/Utility/VisibilityMacros.h>

-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 #ifndef MAGNUM_BUILD_STATIC
    #ifdef MagnumAudio_EXPORTS
--- a/src/Magnum/CMakeLists.txt
+++ b/src/Magnum/CMakeLists.txt
@ -22,8 +22,8 @@
 #   DEALINGS IN THE SOFTWARE.
 #

-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/magnumConfigure.h.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/configure.h)

 # Files shared between main library and unit test library
 set(Magnum_SRCS
@ -119,7 +119,7 @@ set(Magnum_HEADERS
    Types.h
    Version.h

-    magnumVisibility.h)
+    visibility.h)

 # Deprecated headers
 if(BUILD_DEPRECATED)
@ -182,7 +182,7 @@ install(TARGETS Magnum
    LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
    ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
 install(FILES ${Magnum_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR})

 add_subdirectory(Math)
 add_subdirectory(Platform)
--- a/src/Magnum/ColorFormat.h
+++ b/src/Magnum/ColorFormat.h
@ -30,7 +30,7 @@

 #include "Magnum/Magnum.h"
 #include "Magnum/OpenGL.h"
-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"

 namespace Magnum {

--- a/src/Magnum/Context.h
+++ b/src/Magnum/Context.h
@ -35,7 +35,7 @@

 #include "Magnum/Magnum.h"
 #include "Magnum/OpenGL.h"
-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"

 namespace Magnum {

--- a/src/Magnum/DebugMessage.h
+++ b/src/Magnum/DebugMessage.h
@ -32,7 +32,7 @@

 #include "Magnum/Magnum.h"
 #include "Magnum/OpenGL.h"
-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"

 namespace Magnum {

--- a/src/Magnum/DebugTools/CMakeLists.txt
+++ b/src/Magnum/DebugTools/CMakeLists.txt
@ -47,7 +47,7 @@ set(MagnumDebugTools_HEADERS
    ResourceManager.h
    ShapeRenderer.h

-    magnumDebugToolsVisibility.h)
+    visibility.h)

 add_library(MagnumDebugTools ${SHARED_OR_STATIC} ${MagnumDebugTools_SRCS})
 if(BUILD_STATIC_PIC)
--- a/src/Magnum/DebugTools/ForceRenderer.h
+++ b/src/Magnum/DebugTools/ForceRenderer.h
@ -32,7 +32,7 @@
 #include "Magnum/Resource.h"
 #include "Magnum/SceneGraph/Drawable.h"
 #include "Magnum/Shaders/Shaders.h"
-#include "Magnum/DebugTools/magnumDebugToolsVisibility.h"
+#include "Magnum/DebugTools/visibility.h"

 namespace Magnum { namespace DebugTools {

--- a/src/Magnum/DebugTools/ObjectRenderer.h
+++ b/src/Magnum/DebugTools/ObjectRenderer.h
@ -31,7 +31,7 @@
 #include "Magnum/Resource.h"
 #include "Magnum/SceneGraph/Drawable.h"
 #include "Magnum/Shaders/Shaders.h"
-#include "Magnum/DebugTools/magnumDebugToolsVisibility.h"
+#include "Magnum/DebugTools/visibility.h"

 namespace Magnum { namespace DebugTools {

--- a/src/Magnum/DebugTools/Profiler.h
+++ b/src/Magnum/DebugTools/Profiler.h
@ -34,7 +34,7 @@
 #include <vector>

 #include "Magnum/Types.h"
-#include "Magnum/DebugTools/magnumDebugToolsVisibility.h"
+#include "Magnum/DebugTools/visibility.h"

 namespace Magnum { namespace DebugTools {

--- a/src/Magnum/DebugTools/ResourceManager.h
+++ b/src/Magnum/DebugTools/ResourceManager.h
@ -35,7 +35,7 @@

 #include "Magnum/Magnum.h"
 #include "Magnum/DebugTools/DebugTools.h"
-#include "Magnum/DebugTools/magnumDebugToolsVisibility.h"
+#include "Magnum/DebugTools/visibility.h"
 #include "Magnum/SceneGraph/SceneGraph.h"
 #include "Magnum/Shapes/Shapes.h"

--- a/src/Magnum/DebugTools/ShapeRenderer.h
+++ b/src/Magnum/DebugTools/ShapeRenderer.h
@ -33,7 +33,7 @@
 #include "Magnum/SceneGraph/Drawable.h"
 #include "Magnum/Shapes/Shapes.h"
 #include "Magnum/Shapes/shapeImplementation.h"
-#include "Magnum/DebugTools/magnumDebugToolsVisibility.h"
+#include "Magnum/DebugTools/visibility.h"

 namespace Magnum { namespace DebugTools {

--- a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h
+++ b/src/Magnum/DebugTools/magnumDebugToolsVisibility.h
@ -1,5 +1,5 @@
-#ifndef Magnum_DebugTools_magnumDebugToolsVisibility_h
-#define Magnum_DebugTools_magnumDebugToolsVisibility_h
+#ifndef Magnum_DebugTools_visibility_h
+#define Magnum_DebugTools_visibility_h
 /*
    This file is part of Magnum.

@ -26,7 +26,7 @@

 #include <Corrade/Utility/VisibilityMacros.h>

-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 #ifndef MAGNUM_BUILD_STATIC
    #ifdef MagnumDebugTools_EXPORTS
--- a/src/Magnum/Implementation/ShaderState.h
+++ b/src/Magnum/Implementation/ShaderState.h
@ -26,7 +26,7 @@

 #include "Magnum/OpenGL.h"
 #include "Magnum/Types.h"
-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 namespace Magnum { namespace Implementation {

--- a/src/Magnum/Magnum.h
+++ b/src/Magnum/Magnum.h
@ -31,7 +31,6 @@
 #include <Corrade/Utility/Utility.h>

 #include "Magnum/Types.h"
-#include "Magnum/magnumConfigure.h"
 #include "Magnum/Math/Math.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
--- a/src/Magnum/Math/Angle.h
+++ b/src/Magnum/Math/Angle.h
@ -31,7 +31,7 @@
 #include <Corrade/configure.h>
 #include <Corrade/Utility/Debug.h>

-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"
 #include "Magnum/Math/Constants.h"
 #include "Magnum/Math/Math.h"
 #include "Magnum/Math/Unit.h"
--- a/src/Magnum/Math/Functions.h
+++ b/src/Magnum/Math/Functions.h
@ -33,7 +33,7 @@
 #include <type_traits>
 #include <utility>

-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"
 #include "Magnum/Math/Vector.h"

 namespace Magnum { namespace Math {
--- a/src/Magnum/Math/Vector.h
+++ b/src/Magnum/Math/Vector.h
@ -34,7 +34,7 @@
 #include <Corrade/Utility/Debug.h>
 #include <Corrade/Utility/ConfigurationValue.h>

-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"
 #include "Magnum/Math/Angle.h"
 #include "Magnum/Math/BoolVector.h"
 #include "Magnum/Math/TypeTraits.h"
--- a/src/Magnum/MeshTools/CMakeLists.txt
+++ b/src/Magnum/MeshTools/CMakeLists.txt
@ -46,7 +46,7 @@ set(MagnumMeshTools_HEADERS
    Tipsify.h
    Transform.h

-    magnumMeshToolsVisibility.h)
+    visibility.h)

 # Set shared library flags for the objects, as they will be part of shared lib
 # TODO: fix when CMake sets target_EXPORTS for OBJECT targets as well
--- a/src/Magnum/MeshTools/CompressIndices.h
+++ b/src/Magnum/MeshTools/CompressIndices.h
@ -31,7 +31,7 @@
 #include <tuple>

 #include "Magnum/Mesh.h"
-#include "Magnum/MeshTools/magnumMeshToolsVisibility.h"
+#include "Magnum/MeshTools/visibility.h"

 namespace Magnum { namespace MeshTools {

--- a/src/Magnum/MeshTools/FlipNormals.h
+++ b/src/Magnum/MeshTools/FlipNormals.h
@ -31,7 +31,7 @@
 #include <vector>

 #include "Magnum/Magnum.h"
-#include "Magnum/MeshTools/magnumMeshToolsVisibility.h"
+#include "Magnum/MeshTools/visibility.h"

 namespace Magnum { namespace MeshTools {

--- a/src/Magnum/MeshTools/FullScreenTriangle.h
+++ b/src/Magnum/MeshTools/FullScreenTriangle.h
@ -32,7 +32,7 @@
 #include <utility>

 #include "Magnum/Magnum.h"
-#include "Magnum/MeshTools/magnumMeshToolsVisibility.h"
+#include "Magnum/MeshTools/visibility.h"

 namespace Magnum { namespace MeshTools {

--- a/src/Magnum/MeshTools/GenerateFlatNormals.h
+++ b/src/Magnum/MeshTools/GenerateFlatNormals.h
@ -32,7 +32,7 @@
 #include <vector>

 #include "Magnum/Magnum.h"
-#include "Magnum/MeshTools/magnumMeshToolsVisibility.h"
+#include "Magnum/MeshTools/visibility.h"

 namespace Magnum { namespace MeshTools {

--- a/src/Magnum/MeshTools/Tipsify.h
+++ b/src/Magnum/MeshTools/Tipsify.h
@ -31,7 +31,7 @@
 #include <vector>

 #include "Magnum/Types.h"
-#include "Magnum/MeshTools/magnumMeshToolsVisibility.h"
+#include "Magnum/MeshTools/visibility.h"

 namespace Magnum { namespace MeshTools {

--- a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h
+++ b/src/Magnum/MeshTools/magnumMeshToolsVisibility.h
@ -1,5 +1,5 @@
-#ifndef Magnum_MeshTools_magnumMeshToolsVisibility_h
-#define Magnum_MeshTools_magnumMeshToolsVisibility_h
+#ifndef Magnum_MeshTools_visibility_h
+#define Magnum_MeshTools_visibility_h
 /*
    This file is part of Magnum.

@ -26,7 +26,7 @@

 #include <Corrade/Utility/VisibilityMacros.h>

-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 #ifndef MAGNUM_BUILD_STATIC
    #if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS)
--- a/src/Magnum/MeshView.h
+++ b/src/Magnum/MeshView.h
@ -30,7 +30,7 @@

 #include "Magnum/Magnum.h"
 #include "Magnum/OpenGL.h"
-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"

 namespace Magnum {

--- a/src/Magnum/OpenGL.h
+++ b/src/Magnum/OpenGL.h
@ -30,7 +30,7 @@

 #include <Corrade/configure.h>

-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 /** @todo Remove NaCl workaround when not needed */

--- a/src/Magnum/Primitives/CMakeLists.txt
+++ b/src/Magnum/Primitives/CMakeLists.txt
@ -49,7 +49,7 @@ set(MagnumPrimitives_HEADERS
    Square.h
    UVSphere.h

-    magnumPrimitivesVisibility.h)
+    visibility.h)

 add_library(MagnumPrimitives ${SHARED_OR_STATIC} ${MagnumPrimitives_SRCS})
 if(BUILD_STATIC_PIC)
--- a/src/Magnum/Primitives/Capsule.h
+++ b/src/Magnum/Primitives/Capsule.h
@ -28,7 +28,7 @@
 * @brief Class Magnum::Primitives::Capsule
 */

-#include "Magnum/Primitives/magnumPrimitivesVisibility.h"
+#include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"

 namespace Magnum { namespace Primitives {
--- a/src/Magnum/Primitives/Circle.h
+++ b/src/Magnum/Primitives/Circle.h
@ -28,7 +28,7 @@
 * @brief Class Magnum::Primitives::Circle
 */

-#include "Magnum/Primitives/magnumPrimitivesVisibility.h"
+#include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"

 namespace Magnum { namespace Primitives {
--- a/src/Magnum/Primitives/Crosshair.h
+++ b/src/Magnum/Primitives/Crosshair.h
@ -28,7 +28,7 @@
 * @brief Class Magnum::Primitives::Crosshair2D, Magnum::Primitives::Crosshair3D
 */

-#include "Magnum/Primitives/magnumPrimitivesVisibility.h"
+#include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"

 namespace Magnum { namespace Primitives {
--- a/src/Magnum/Primitives/Cube.h
+++ b/src/Magnum/Primitives/Cube.h
@ -28,7 +28,7 @@
 * @brief Class Magnum::Primitives::Cube
 */

-#include "Magnum/Primitives/magnumPrimitivesVisibility.h"
+#include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"

 namespace Magnum { namespace Primitives {
--- a/src/Magnum/Primitives/Cylinder.h
+++ b/src/Magnum/Primitives/Cylinder.h
@ -31,7 +31,7 @@
 #include <Corrade/Containers/EnumSet.h>

 #include "Magnum/Magnum.h"
-#include "Magnum/Primitives/magnumPrimitivesVisibility.h"
+#include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"

 namespace Magnum { namespace Primitives {
--- a/src/Magnum/Primitives/Icosphere.h
+++ b/src/Magnum/Primitives/Icosphere.h
@ -28,7 +28,7 @@
 * @brief Class Magnum::Primitives::Icosphere
 */

-#include "Magnum/Primitives/magnumPrimitivesVisibility.h"
+#include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"

 namespace Magnum { namespace Primitives {
--- a/src/Magnum/Primitives/Line.h
+++ b/src/Magnum/Primitives/Line.h
@ -28,7 +28,7 @@
 * @brief Class Magnum::Primitives::Line2D, Magnum::Primitives::Line3D
 */

-#include "Magnum/Primitives/magnumPrimitivesVisibility.h"
+#include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"

 namespace Magnum { namespace Primitives {
--- a/src/Magnum/Primitives/Plane.h
+++ b/src/Magnum/Primitives/Plane.h
@ -29,7 +29,7 @@
 */

 #include "Magnum/Trade/Trade.h"
-#include "Magnum/Primitives/magnumPrimitivesVisibility.h"
+#include "Magnum/Primitives/visibility.h"

 namespace Magnum { namespace Primitives {

--- a/src/Magnum/Primitives/Square.h
+++ b/src/Magnum/Primitives/Square.h
@ -28,7 +28,7 @@
 * @brief Class Magnum::Primitives::Square
 */

-#include "Magnum/Primitives/magnumPrimitivesVisibility.h"
+#include "Magnum/Primitives/visibility.h"
 #include "Magnum/Trade/Trade.h"

 namespace Magnum { namespace Primitives {
--- a/src/Magnum/Primitives/UVSphere.h
+++ b/src/Magnum/Primitives/UVSphere.h
@ -29,7 +29,7 @@
 */

 #include "Magnum/Trade/Trade.h"
-#include "Magnum/Primitives/magnumPrimitivesVisibility.h"
+#include "Magnum/Primitives/visibility.h"

 namespace Magnum { namespace Primitives {

--- a/src/Magnum/Primitives/magnumPrimitivesVisibility.h
+++ b/src/Magnum/Primitives/magnumPrimitivesVisibility.h
@ -1,5 +1,5 @@
-#ifndef Magnum_Primitives_magnumPrimitivesVisibility_h
-#define Magnum_Primitives_magnumPrimitivesVisibility_h
+#ifndef Magnum_Primitives_visibility_h
+#define Magnum_Primitives_visibility_h
 /*
    This file is part of Magnum.

@ -26,7 +26,7 @@

 #include <Corrade/Utility/VisibilityMacros.h>

-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 #ifndef MAGNUM_BUILD_STATIC
    #ifdef MagnumPrimitives_EXPORTS
--- a/src/Magnum/Query.h
+++ b/src/Magnum/Query.h
@ -31,7 +31,7 @@
 #include <Corrade/Utility/Assert.h>

 #include "Magnum/AbstractObject.h"
-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 namespace Magnum {

--- a/src/Magnum/Renderbuffer.h
+++ b/src/Magnum/Renderbuffer.h
@ -30,7 +30,6 @@

 #include "Magnum/AbstractObject.h"
 #include "Magnum/Magnum.h"
-#include "Magnum/magnumVisibility.h"

 namespace Magnum {

--- a/src/Magnum/Renderer.h
+++ b/src/Magnum/Renderer.h
@ -32,7 +32,7 @@

 #include "Magnum/Magnum.h"
 #include "Magnum/OpenGL.h"
-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"

 namespace Magnum {

--- a/src/Magnum/Resource.h
+++ b/src/Magnum/Resource.h
@ -32,7 +32,7 @@
 #include <Corrade/Utility/MurmurHash2.h>

 #include "Magnum/Magnum.h"
-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"

 namespace Magnum {

--- a/src/Magnum/Sampler.h
+++ b/src/Magnum/Sampler.h
@ -30,7 +30,7 @@

 #include "Magnum/Magnum.h"
 #include "Magnum/OpenGL.h"
-#include "Magnum/magnumVisibility.h"
+#include "Magnum/visibility.h"

 namespace Magnum {

--- a/src/Magnum/SceneGraph/AbstractCamera.h
+++ b/src/Magnum/SceneGraph/AbstractCamera.h
@ -31,7 +31,7 @@
 #include "Magnum/Math/Matrix3.h"
 #include "Magnum/Math/Matrix4.h"
 #include "Magnum/SceneGraph/AbstractFeature.h"
-#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h"
+#include "Magnum/SceneGraph/visibility.h"

 namespace Magnum { namespace SceneGraph {

--- a/src/Magnum/SceneGraph/AbstractObject.h
+++ b/src/Magnum/SceneGraph/AbstractObject.h
@ -33,7 +33,7 @@

 #include "Magnum/DimensionTraits.h"
 #include "Magnum/SceneGraph/SceneGraph.h"
-#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h"
+#include "Magnum/SceneGraph/visibility.h"

 namespace Magnum { namespace SceneGraph {

--- a/src/Magnum/SceneGraph/AbstractTransformation.h
+++ b/src/Magnum/SceneGraph/AbstractTransformation.h
@ -29,7 +29,7 @@
 */

 #include "Magnum/SceneGraph/SceneGraph.h"
-#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h"
+#include "Magnum/SceneGraph/visibility.h"

 namespace Magnum { namespace SceneGraph {

--- a/src/Magnum/SceneGraph/Animable.h
+++ b/src/Magnum/SceneGraph/Animable.h
@ -29,7 +29,7 @@
 */

 #include "Magnum/SceneGraph/AbstractGroupedFeature.h"
-#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h"
+#include "Magnum/SceneGraph/visibility.h"

 namespace Magnum { namespace SceneGraph {

--- a/src/Magnum/SceneGraph/AnimableGroup.h
+++ b/src/Magnum/SceneGraph/AnimableGroup.h
@ -29,7 +29,7 @@
 */

 #include "Magnum/SceneGraph/FeatureGroup.h"
-#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h"
+#include "Magnum/SceneGraph/visibility.h"

 namespace Magnum { namespace SceneGraph {

--- a/src/Magnum/SceneGraph/CMakeLists.txt
+++ b/src/Magnum/SceneGraph/CMakeLists.txt
@ -66,7 +66,7 @@ set(MagnumSceneGraph_HEADERS
    SceneGraph.h
    TranslationTransformation.h

-    magnumSceneGraphVisibility.h)
+    visibility.h)

 # Set shared library flags for the objects, as they will be part of shared lib
 # TODO: fix when CMake sets target_EXPORTS for OBJECT targets as well
--- a/src/Magnum/SceneGraph/FeatureGroup.h
+++ b/src/Magnum/SceneGraph/FeatureGroup.h
@ -32,7 +32,7 @@
 #include <Corrade/Utility/Assert.h>

 #include "Magnum/SceneGraph/SceneGraph.h"
-#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h"
+#include "Magnum/SceneGraph/visibility.h"

 namespace Magnum { namespace SceneGraph {

--- a/src/Magnum/SceneGraph/Object.h
+++ b/src/Magnum/SceneGraph/Object.h
@ -32,7 +32,7 @@

 #include "Magnum/SceneGraph/AbstractFeature.h"
 #include "Magnum/SceneGraph/AbstractObject.h"
-#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h"
+#include "Magnum/SceneGraph/visibility.h"

 namespace Magnum { namespace SceneGraph {

--- a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h
+++ b/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h
@ -1,5 +1,5 @@
-#ifndef Magnum_SceneGraph_magnumSceneGraphVisibility_h
-#define Magnum_SceneGraph_magnumSceneGraphVisibility_h
+#ifndef Magnum_SceneGraph_visibility_h
+#define Magnum_SceneGraph_visibility_h
 /*
    This file is part of Magnum.

@ -26,7 +26,7 @@

 #include <Corrade/Utility/VisibilityMacros.h>

-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 #ifndef MAGNUM_BUILD_STATIC
    #if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS)
--- a/src/Magnum/Shader.h
+++ b/src/Magnum/Shader.h
@ -33,7 +33,6 @@

 #include "Magnum/AbstractObject.h"
 #include "Magnum/Magnum.h"
-#include "Magnum/magnumVisibility.h"

 namespace Magnum {

--- a/src/Magnum/Shaders/CMakeLists.txt
+++ b/src/Magnum/Shaders/CMakeLists.txt
@ -44,7 +44,7 @@ set(MagnumShaders_HEADERS
    Vector.h
    VertexColor.h

-    magnumShadersVisibility.h)
+    visibility.h)

 if(BUILD_STATIC)
    set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} magnumShadersResourceImport.hpp)
--- a/src/Magnum/Shaders/DistanceFieldVector.h
+++ b/src/Magnum/Shaders/DistanceFieldVector.h
@ -33,7 +33,7 @@
 #include "Magnum/Math/Matrix3.h"
 #include "Magnum/Math/Matrix4.h"
 #include "Magnum/Shaders/AbstractVector.h"
-#include "Magnum/Shaders/magnumShadersVisibility.h"
+#include "Magnum/Shaders/visibility.h"

 namespace Magnum { namespace Shaders {

--- a/src/Magnum/Shaders/Flat.h
+++ b/src/Magnum/Shaders/Flat.h
@ -33,7 +33,7 @@
 #include "Magnum/Math/Matrix3.h"
 #include "Magnum/Math/Matrix4.h"
 #include "Magnum/Shaders/Generic.h"
-#include "Magnum/Shaders/magnumShadersVisibility.h"
+#include "Magnum/Shaders/visibility.h"

 namespace Magnum { namespace Shaders {

--- a/src/Magnum/Shaders/MeshVisualizer.h
+++ b/src/Magnum/Shaders/MeshVisualizer.h
@ -32,7 +32,7 @@
 #include "Magnum/AbstractShaderProgram.h"
 #include "Magnum/Color.h"

-#include "Magnum/Shaders/magnumShadersVisibility.h"
+#include "Magnum/Shaders/visibility.h"

 namespace Magnum { namespace Shaders {

--- a/src/Magnum/Shaders/Phong.h
+++ b/src/Magnum/Shaders/Phong.h
@ -31,7 +31,7 @@
 #include "Magnum/Color.h"
 #include "Magnum/Math/Matrix4.h"
 #include "Magnum/Shaders/Generic.h"
-#include "Magnum/Shaders/magnumShadersVisibility.h"
+#include "Magnum/Shaders/visibility.h"

 namespace Magnum { namespace Shaders {

--- a/src/Magnum/Shaders/Vector.h
+++ b/src/Magnum/Shaders/Vector.h
@ -33,7 +33,7 @@
 #include "Magnum/Math/Matrix3.h"
 #include "Magnum/Math/Matrix4.h"
 #include "Magnum/Shaders/AbstractVector.h"
-#include "Magnum/Shaders/magnumShadersVisibility.h"
+#include "Magnum/Shaders/visibility.h"

 namespace Magnum { namespace Shaders {

--- a/src/Magnum/Shaders/VertexColor.h
+++ b/src/Magnum/Shaders/VertexColor.h
@ -33,7 +33,7 @@
 #include "Magnum/Math/Matrix3.h"
 #include "Magnum/Math/Matrix4.h"
 #include "Magnum/Shaders/Generic.h"
-#include "Magnum/Shaders/magnumShadersVisibility.h"
+#include "Magnum/Shaders/visibility.h"

 namespace Magnum { namespace Shaders {

--- a/src/Magnum/Shaders/magnumShadersResourceImport.hpp
+++ b/src/Magnum/Shaders/magnumShadersResourceImport.hpp
@ -24,7 +24,7 @@
    DEALINGS IN THE SOFTWARE.
 */

-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 #ifdef MAGNUM_BUILD_STATIC
 #include <Corrade/Utility/Resource.h>
--- a/src/Magnum/Shaders/magnumShadersVisibility.h
+++ b/src/Magnum/Shaders/magnumShadersVisibility.h
@ -26,7 +26,7 @@

 #include <Corrade/Utility/VisibilityMacros.h>

-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 #ifndef MAGNUM_BUILD_STATIC
    #ifdef MagnumShaders_EXPORTS
--- a/src/Magnum/Shapes/AbstractShape.h
+++ b/src/Magnum/Shapes/AbstractShape.h
@ -30,9 +30,9 @@

 #include "Magnum/Magnum.h"
 #include "Magnum/DimensionTraits.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
-#include "Magnum/Shapes/shapeImplementation.h"
 #include "Magnum/SceneGraph/AbstractGroupedFeature.h"
+#include "Magnum/Shapes/shapeImplementation.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/AxisAlignedBox.h
+++ b/src/Magnum/Shapes/AxisAlignedBox.h
@ -31,7 +31,7 @@
 #include "Magnum/DimensionTraits.h"
 #include "Magnum/Math/Vector3.h"
 #include "Magnum/Shapes/Shapes.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/Box.h
+++ b/src/Magnum/Shapes/Box.h
@ -31,7 +31,7 @@
 #include "Magnum/DimensionTraits.h"
 #include "Magnum/Math/Matrix3.h"
 #include "Magnum/Math/Matrix4.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/CMakeLists.txt
+++ b/src/Magnum/Shapes/CMakeLists.txt
@ -57,8 +57,8 @@ set(MagnumShapes_HEADERS
    Point.h
    Sphere.h

-    magnumShapesVisibility.h
-    shapeImplementation.h)
+    shapeImplementation.h
+    visibility.h)

 add_library(MagnumShapes ${SHARED_OR_STATIC} ${MagnumShapes_SRCS})
 if(BUILD_STATIC_PIC)
--- a/src/Magnum/Shapes/Capsule.h
+++ b/src/Magnum/Shapes/Capsule.h
@ -31,7 +31,7 @@
 #include "Magnum/DimensionTraits.h"
 #include "Magnum/Math/Vector3.h"
 #include "Magnum/Shapes/Shapes.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/Composition.h
+++ b/src/Magnum/Shapes/Composition.h
@ -35,8 +35,8 @@

 #include "Magnum/DimensionTraits.h"
 #include "Magnum/Shapes/Shapes.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
 #include "Magnum/Shapes/shapeImplementation.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/Cylinder.h
+++ b/src/Magnum/Shapes/Cylinder.h
@ -31,7 +31,7 @@
 #include "Magnum/DimensionTraits.h"
 #include "Magnum/Math/Vector3.h"
 #include "Magnum/Shapes/Shapes.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/Line.h
+++ b/src/Magnum/Shapes/Line.h
@ -30,7 +30,7 @@

 #include "Magnum/DimensionTraits.h"
 #include "Magnum/Math/Vector3.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/Plane.h
+++ b/src/Magnum/Shapes/Plane.h
@ -31,7 +31,7 @@
 #include "Magnum/Magnum.h"
 #include "Magnum/Math/Vector3.h"
 #include "Magnum/Shapes/Shapes.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/Point.h
+++ b/src/Magnum/Shapes/Point.h
@ -30,7 +30,7 @@

 #include "Magnum/DimensionTraits.h"
 #include "Magnum/Math/Vector3.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/Shape.h
+++ b/src/Magnum/Shapes/Shape.h
@ -30,7 +30,7 @@

 #include "Magnum/Shapes/AbstractShape.h"
 #include "Magnum/Shapes/Shapes.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/ShapeGroup.h
+++ b/src/Magnum/Shapes/ShapeGroup.h
@ -32,7 +32,7 @@

 #include "Magnum/SceneGraph/FeatureGroup.h"
 #include "Magnum/Shapes/AbstractShape.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/Sphere.h
+++ b/src/Magnum/Shapes/Sphere.h
@ -32,7 +32,7 @@
 #include "Magnum/Math/Vector3.h"
 #include "Magnum/Shapes/Collision.h"
 #include "Magnum/Shapes/Shapes.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes {

--- a/src/Magnum/Shapes/shapeImplementation.h
+++ b/src/Magnum/Shapes/shapeImplementation.h
@ -31,7 +31,7 @@
 #include "Magnum/DimensionTraits.h"
 #include "Magnum/Magnum.h"
 #include "Magnum/Shapes/Shapes.h"
-#include "Magnum/Shapes/magnumShapesVisibility.h"
+#include "Magnum/Shapes/visibility.h"

 namespace Magnum { namespace Shapes { namespace Implementation {

--- a/src/Magnum/Shapes/magnumShapesVisibility.h
+++ b/src/Magnum/Shapes/magnumShapesVisibility.h
@ -1,5 +1,5 @@
-#ifndef Magnum_Shapes_magnumShapesVisibility_h
-#define Magnum_Shapes_magnumShapesVisibility_h
+#ifndef Magnum_Shapes_visibility_h
+#define Magnum_Shapes_visibility_h
 /*
    This file is part of Magnum.

@ -26,7 +26,7 @@

 #include <Corrade/Utility/VisibilityMacros.h>

-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"

 #ifndef MAGNUM_BUILD_STATIC
    #ifdef MagnumShapes_EXPORTS
--- a/src/Magnum/Test/CMakeLists.txt
+++ b/src/Magnum/Test/CMakeLists.txt
@ -70,9 +70,9 @@ if(BUILD_GL_TESTS)
        ${QueryGLTest_RES}
        LIBRARIES ${GL_TEST_LIBRARIES})

-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ShaderGLTestConfigure.h.cmake
-                   ${CMAKE_CURRENT_BINARY_DIR}/ShaderGLTestConfigure.h)
-    include_directories(${CMAKE_CURRENT_BINARY_DIR})
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
+                   ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
+    include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
    corrade_add_test(ShaderGLTest ShaderGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})

    if(NOT MAGNUM_TARGET_GLES2)
--- a/src/Magnum/Test/ShaderGLTest.cpp
+++ b/src/Magnum/Test/ShaderGLTest.cpp
@ -29,7 +29,7 @@
 #include "Magnum/Shader.h"
 #include "Magnum/Test/AbstractOpenGLTester.h"

-#include "ShaderGLTestConfigure.h"
+#include "configure.h"

 namespace Magnum { namespace Test {

--- a/src/Magnum/Test/ShaderGLTestConfigure.h.cmake
+++ b/src/Magnum/Test/ShaderGLTestConfigure.h.cmake
--- a/src/Magnum/Text/AbstractFont.h
+++ b/src/Magnum/Text/AbstractFont.h
@ -36,7 +36,7 @@
 #include "Magnum/Magnum.h"
 #include "Magnum/Texture.h"
 #include "Magnum/Text/Text.h"
-#include "Magnum/Text/magnumTextVisibility.h"
+#include "Magnum/Text/visibility.h"

 namespace Magnum { namespace Text {

--- a/src/Magnum/Text/AbstractFontConverter.h
+++ b/src/Magnum/Text/AbstractFontConverter.h
@ -33,7 +33,7 @@

 #include "Magnum/Magnum.h"
 #include "Magnum/Text/Text.h"
-#include "Magnum/Text/magnumTextVisibility.h"
+#include "Magnum/Text/visibility.h"

 namespace Magnum { namespace Text {

--- a/src/Magnum/Text/CMakeLists.txt
+++ b/src/Magnum/Text/CMakeLists.txt
@ -37,7 +37,7 @@ set(MagnumText_HEADERS
    Renderer.h
    Text.h

-    magnumTextVisibility.h)
+    visibility.h)

 if(MAGNUM_BUILD_DEPRECATED)
    set(MagnumText_HEADERS ${MagnumText_HEADERS}
@ -65,7 +65,7 @@ if(WITH_FONTCONVERTER)
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
                   ${CMAKE_CURRENT_BINARY_DIR}/configure.h)

-    include_directories(${CMAKE_CURRENT_BINARY_DIR})
+    include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})

    add_executable(magnum-fontconverter fontconverter.cpp)
    target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES})
--- a/src/Magnum/Text/GlyphCache.h
+++ b/src/Magnum/Text/GlyphCache.h
@ -33,7 +33,7 @@

 #include "Magnum/Math/Range.h"
 #include "Magnum/Texture.h"
-#include "Magnum/Text/magnumTextVisibility.h"
+#include "Magnum/Text/visibility.h"

 namespace Magnum { namespace Text {

--- a/src/Magnum/Text/Renderer.h
+++ b/src/Magnum/Text/Renderer.h
@ -38,7 +38,7 @@
 #include "Magnum/Mesh.h"
 #include "Magnum/Text/Text.h"
 #include "Magnum/Text/Alignment.h"
-#include "Magnum/Text/magnumTextVisibility.h"
+#include "Magnum/Text/visibility.h"

 namespace Magnum { namespace Text {

--- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp
+++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp
@ -30,7 +30,7 @@
 #include "Magnum/Text/AbstractFontConverter.h"
 #include "Magnum/Text/GlyphCache.h"

-#include "testConfigure.h"
+#include "configure.h"

 namespace Magnum { namespace Text { namespace Test {

--- a/src/Magnum/Text/Test/AbstractFontTest.cpp
+++ b/src/Magnum/Text/Test/AbstractFontTest.cpp
@ -28,7 +28,7 @@

 #include "Magnum/Text/AbstractFont.h"

-#include "testConfigure.h"
+#include "configure.h"

 namespace Magnum { namespace Text { namespace Test {

--- a/src/Magnum/Text/Test/CMakeLists.txt
+++ b/src/Magnum/Text/Test/CMakeLists.txt
@ -22,10 +22,10 @@
 #   DEALINGS IN THE SOFTWARE.
 #

-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/testConfigure.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/configure.h)

-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})

 corrade_add_test(TextAbstractFontTest AbstractFontTest.cpp LIBRARIES Magnum MagnumText)
 corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp LIBRARIES Magnum MagnumText)
--- a/Show More
+++ b/Show More