summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt32
-rw-r--r--src/Makefile.am32
-rw-r--r--src/actionmanager.cpp3
-rw-r--r--src/animatedsprite.cpp3
-rw-r--r--src/animationparticle.cpp3
-rw-r--r--src/commands.cpp10
-rw-r--r--src/compoundsprite.cpp3
-rw-r--r--src/defaults.cpp4
-rw-r--r--src/flooritem.cpp3
-rw-r--r--src/graphicsmanager.cpp5
-rw-r--r--src/graphicsvertexes.h6
-rw-r--r--src/gui/sdlfont.cpp3
-rw-r--r--src/gui/theme.h3
-rw-r--r--src/gui/widgets/window.h5
-rw-r--r--src/imageparticle.cpp3
-rw-r--r--src/imagesprite.cpp2
-rw-r--r--src/localplayer.cpp3
-rw-r--r--src/maplayer.cpp3
-rw-r--r--src/playerrelations.cpp3
-rw-r--r--src/render/graphics.cpp (renamed from src/graphics.cpp)2
-rw-r--r--src/render/graphics.h (renamed from src/graphics.h)0
-rw-r--r--src/render/mobileopenglgraphics.cpp (renamed from src/mobileopenglgraphics.cpp)2
-rw-r--r--src/render/mobileopenglgraphics.h (renamed from src/mobileopenglgraphics.h)2
-rw-r--r--src/render/normalopenglgraphics.cpp (renamed from src/normalopenglgraphics.cpp)2
-rw-r--r--src/render/normalopenglgraphics.h (renamed from src/normalopenglgraphics.h)2
-rw-r--r--src/render/nullopenglgraphics.cpp (renamed from src/nullopenglgraphics.cpp)2
-rw-r--r--src/render/nullopenglgraphics.h (renamed from src/nullopenglgraphics.h)2
-rw-r--r--src/render/safeopenglgraphics.cpp (renamed from src/safeopenglgraphics.cpp)2
-rw-r--r--src/render/safeopenglgraphics.h (renamed from src/safeopenglgraphics.h)2
-rw-r--r--src/render/sdl2graphics.cpp (renamed from src/sdl2graphics.cpp)2
-rw-r--r--src/render/sdl2graphics.h (renamed from src/sdl2graphics.h)2
-rw-r--r--src/render/sdlgraphics.cpp (renamed from src/sdlgraphics.cpp)2
-rw-r--r--src/render/sdlgraphics.h (renamed from src/sdlgraphics.h)4
-rw-r--r--src/render/surfacegraphics.cpp (renamed from src/surfacegraphics.cpp)2
-rw-r--r--src/render/surfacegraphics.h (renamed from src/surfacegraphics.h)2
-rw-r--r--src/resources/ambientlayer.cpp2
-rw-r--r--src/resources/atlasmanager.cpp3
-rw-r--r--src/resources/fboinfo.h2
-rw-r--r--src/resources/image.cpp6
-rw-r--r--src/resources/openglimagehelper.cpp7
-rw-r--r--src/resources/subimage.cpp6
-rw-r--r--src/rotationalparticle.cpp3
-rw-r--r--src/simpleanimation.cpp3
-rw-r--r--src/test/testlauncher.cpp3
-rw-r--r--src/text.h5
-rw-r--r--src/textparticle.cpp2
-rw-r--r--src/touchmanager.cpp3
-rw-r--r--src/utils/copynpaste.cpp2
48 files changed, 114 insertions, 94 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4de5478a3..31550cf00 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -612,8 +612,8 @@ SET(SRCS
flooritem.h
game.cpp
game.h
- graphics.cpp
- graphics.h
+ render/graphics.cpp
+ render/graphics.h
graphicsmanager.cpp
graphicsmanager.h
graphicsvertexes.cpp
@@ -665,21 +665,21 @@ SET(SRCS
maplayer.h
mgl.cpp
mgl.h
- mobileopenglgraphics.cpp
- mobileopenglgraphics.h
+ render/mobileopenglgraphics.cpp
+ render/mobileopenglgraphics.h
mouseinput.cpp
mouseinput.h
mumblemanager.cpp
mumblemanager.h
navigationmanager.cpp
navigationmanager.h
- normalopenglgraphics.cpp
- normalopenglgraphics.h
+ render/normalopenglgraphics.cpp
+ render/normalopenglgraphics.h
notifications.h
notifymanager.cpp
notifymanager.h
- nullopenglgraphics.cpp
- nullopenglgraphics.h
+ render/nullopenglgraphics.cpp
+ render/nullopenglgraphics.h
particle.cpp
particle.h
particlecontainer.cpp
@@ -698,12 +698,12 @@ SET(SRCS
properties.h
rotationalparticle.cpp
rotationalparticle.h
- safeopenglgraphics.cpp
- safeopenglgraphics.h
- sdl2graphics.cpp
- sdl2graphics.h
- sdlgraphics.cpp
- sdlgraphics.h
+ render/safeopenglgraphics.cpp
+ render/safeopenglgraphics.h
+ render/sdl2graphics.cpp
+ render/sdl2graphics.h
+ render/sdlgraphics.cpp
+ render/sdlgraphics.h
sdlshared.h
shopitem.cpp
shopitem.h
@@ -715,8 +715,8 @@ SET(SRCS
sprite.h
statuseffect.cpp
statuseffect.h
- surfacegraphics.cpp
- surfacegraphics.h
+ render/surfacegraphics.cpp
+ render/surfacegraphics.h
text.cpp
text.h
textmanager.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 4906ed4ca..5e159ffe4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -623,8 +623,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
flooritem.h \
game.cpp \
game.h \
- graphics.cpp \
- graphics.h \
+ render/graphics.cpp \
+ render/graphics.h \
graphicsmanager.cpp \
graphicsmanager.h \
graphicsvertexes.cpp \
@@ -676,19 +676,19 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
maplayer.h \
mgl.cpp \
mgl.h \
- mobileopenglgraphics.cpp \
- mobileopenglgraphics.h \
+ render/mobileopenglgraphics.cpp \
+ render/mobileopenglgraphics.h \
mouseinput.cpp \
mouseinput.h \
navigationmanager.cpp \
navigationmanager.h \
- normalopenglgraphics.cpp \
- normalopenglgraphics.h \
+ render/normalopenglgraphics.cpp \
+ render/normalopenglgraphics.h \
notifications.h \
notifymanager.cpp \
notifymanager.h \
- nullopenglgraphics.cpp \
- nullopenglgraphics.h \
+ render/nullopenglgraphics.cpp \
+ render/nullopenglgraphics.h \
particle.cpp \
particle.h \
particlecontainer.cpp \
@@ -707,12 +707,12 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
properties.h \
rotationalparticle.cpp \
rotationalparticle.h \
- safeopenglgraphics.cpp\
- safeopenglgraphics.h \
- sdl2graphics.cpp \
- sdl2graphics.h \
- sdlgraphics.cpp \
- sdlgraphics.h \
+ render/safeopenglgraphics.cpp\
+ render/safeopenglgraphics.h \
+ render/sdl2graphics.cpp \
+ render/sdl2graphics.h \
+ render/sdlgraphics.cpp \
+ render/sdlgraphics.h \
sdlshared.h \
shopitem.cpp \
shopitem.h \
@@ -724,8 +724,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
sprite.h \
statuseffect.cpp \
statuseffect.h \
- surfacegraphics.cpp \
- surfacegraphics.h \
+ render/surfacegraphics.cpp \
+ render/surfacegraphics.h \
text.cpp \
text.h \
textmanager.cpp \
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 54bf179ae..3ce8c39a1 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -24,7 +24,6 @@
#include "dropshortcut.h"
#include "emoteshortcut.h"
#include "game.h"
-#include "graphics.h"
#include "inputevent.h"
#include "itemshortcut.h"
#include "inputmanager.h"
@@ -59,6 +58,8 @@
#include "gui/widgets/chattab.h"
+#include "render/graphics.h"
+
#include "net/playerhandler.h"
#include "utils/gettext.h"
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 211b73f87..b31ca92bf 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -23,9 +23,10 @@
#include "animatedsprite.h"
#include "animationdelayload.h"
-#include "graphics.h"
#include "logger.h"
+#include "render/graphics.h"
+
#include "resources/action.h"
#include "resources/animation.h"
#include "resources/image.h"
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp
index 7a60730de..2c4936518 100644
--- a/src/animationparticle.cpp
+++ b/src/animationparticle.cpp
@@ -22,9 +22,10 @@
#include "animationparticle.h"
-#include "graphics.h"
#include "simpleanimation.h"
+#include "render/graphics.h"
+
#include "debug.h"
AnimationParticle::AnimationParticle(Map *const map,
diff --git a/src/commands.cpp b/src/commands.cpp
index d301ab391..d16eeccec 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -30,7 +30,6 @@
#include "guildmanager.h"
#include "localplayer.h"
#include "main.h"
-#include "nullopenglgraphics.h"
#include "party.h"
#include "gui/buydialog.h"
@@ -45,6 +44,11 @@
#include "gui/widgets/whispertab.h"
+#if defined USE_OPENGL
+#include "render/normalopenglgraphics.h"
+#endif
+#include "render/nullopenglgraphics.h"
+
#include "net/adminhandler.h"
#include "net/beinghandler.h"
#include "net/chathandler.h"
@@ -55,10 +59,6 @@
#include "net/playerhandler.h"
#include "net/tradehandler.h"
-#if defined USE_OPENGL
-#include "normalopenglgraphics.h"
-#endif
-
#ifdef DEBUG_DUMP_LEAKS1
#include "resources/image.h"
#include "resources/resource.h"
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index c6971a518..9ca7ce8fb 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -31,7 +31,8 @@
#include "map.h"
#include "sdlshared.h"
-#include "surfacegraphics.h"
+
+#include "render/surfacegraphics.h"
#include "resources/image.h"
#include "resources/imagehelper.h"
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 2aa3e8ad5..271cf7315 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -23,12 +23,12 @@
#include "being.h"
#include "client.h"
-#include "graphics.h"
#include "graphicsmanager.h"
#include "keydata.h"
-#include "utils/stringutils.h"
+#include "render/graphics.h"
+#include "utils/stringutils.h"
#include <stdlib.h>
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index 623dd9682..5037f2346 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -23,10 +23,11 @@
#include "flooritem.h"
#include "client.h"
-#include "graphics.h"
#include "item.h"
#include "configuration.h"
+#include "render/graphics.h"
+
#include "gui/gui.h"
#include "gui/sdlfont.h"
#include "gui/userpalette.h"
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index d39af895d..0e88473f1 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -37,11 +37,12 @@
#endif
#include "configuration.h"
-#include "graphics.h"
#include "graphicsvertexes.h"
#include "logger.h"
#include "mgl.h"
-#include "sdlgraphics.h"
+
+#include "render/graphics.h"
+#include "render/sdlgraphics.h"
#include "resources/fboinfo.h"
#include "resources/imagehelper.h"
diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h
index 6324341e3..3b0e48fe2 100644
--- a/src/graphicsvertexes.h
+++ b/src/graphicsvertexes.h
@@ -38,9 +38,9 @@
#include <SDL.h>
-#include "mobileopenglgraphics.h"
-#include "normalopenglgraphics.h"
-#include "safeopenglgraphics.h"
+#include "render/mobileopenglgraphics.h"
+#include "render/normalopenglgraphics.h"
+#include "render/safeopenglgraphics.h"
#endif
#include "resources/image.h"
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index c0ca34bbb..c9093b747 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -26,7 +26,8 @@
#include "client.h"
#include "logger.h"
#include "main.h"
-#include "sdlgraphics.h"
+
+#include "render/sdlgraphics.h"
#include "resources/image.h"
#include "resources/imagehelper.h"
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 21f541701..9fe49371a 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -26,7 +26,8 @@
#define GUI_THEME_H
#include "configlistener.h"
-#include "graphics.h"
+
+#include "render/graphics.h"
#include "gui/palette.h"
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index f6c5d0765..d1387aca8 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -23,8 +23,7 @@
#ifndef GUI_WIDGETS_WINDOW_H
#define GUI_WIDGETS_WINDOW_H
-#include "graphics.h"
-#include "localconsts.h"
+#include "render/graphics.h"
#include "gui/widgets/widget2.h"
@@ -32,6 +31,8 @@
#include <guichan/widgets/window.hpp>
+#include "localconsts.h"
+
class ContainerPlacer;
class ImageCollection;
class Layout;
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index 457d66cc6..52d66178c 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -22,9 +22,10 @@
#include "imageparticle.h"
-#include "graphics.h"
#include "logger.h"
+#include "render/graphics.h"
+
#include "resources/image.h"
#include "debug.h"
diff --git a/src/imagesprite.cpp b/src/imagesprite.cpp
index 887ef0bdd..89b33937a 100644
--- a/src/imagesprite.cpp
+++ b/src/imagesprite.cpp
@@ -21,7 +21,7 @@
#include "imagesprite.h"
-#include "graphics.h"
+#include "render/graphics.h"
#include "debug.h"
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 254d03113..4de5dca23 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -27,7 +27,6 @@
#include "configuration.h"
#include "dropshortcut.h"
#include "effectmanager.h"
-#include "graphics.h"
#include "guild.h"
#include "item.h"
#include "keyboardconfig.h"
@@ -57,6 +56,8 @@
#include "gui/widgets/gmtab.h"
#include "gui/widgets/whispertab.h"
+#include "render/graphics.h"
+
#include "net/beinghandler.h"
#include "net/chathandler.h"
#include "net/guildhandler.h"
diff --git a/src/maplayer.cpp b/src/maplayer.cpp
index 81561d94a..10aa6b4c9 100644
--- a/src/maplayer.cpp
+++ b/src/maplayer.cpp
@@ -24,8 +24,9 @@
#include "configuration.h"
#include "graphicsvertexes.h"
+
#ifndef USE_OPENGL
-#include "graphics.h"
+#include "render/graphics.h"
#endif
#include "localplayer.h"
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 70d726d52..d20153cad 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -24,9 +24,10 @@
#include "actorspritemanager.h"
#include "configuration.h"
-#include "graphics.h"
#include "localplayer.h"
+#include "render/graphics.h"
+
#include "utils/dtor.h"
#include "utils/gettext.h"
diff --git a/src/graphics.cpp b/src/render/graphics.cpp
index 2e561c648..42de3429d 100644
--- a/src/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "graphics.h"
+#include "render/graphics.h"
#include "main.h"
diff --git a/src/graphics.h b/src/render/graphics.h
index 7dafcbc45..7dafcbc45 100644
--- a/src/graphics.h
+++ b/src/render/graphics.h
diff --git a/src/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index fab5bfab3..054588645 100644
--- a/src/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -24,7 +24,7 @@
#ifdef USE_OPENGL
-#include "mobileopenglgraphics.h"
+#include "render/mobileopenglgraphics.h"
#include "configuration.h"
#include "graphicsmanager.h"
diff --git a/src/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h
index 87755b9ff..1597d3bd9 100644
--- a/src/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -27,7 +27,7 @@
#ifdef USE_OPENGL
#include "localconsts.h"
-#include "graphics.h"
+#include "render/graphics.h"
#include "resources/fboinfo.h"
diff --git a/src/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 700983f01..91cd429fb 100644
--- a/src/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -23,7 +23,7 @@
#include "main.h"
#if defined USE_OPENGL && !defined ANDROID
-#include "normalopenglgraphics.h"
+#include "render/normalopenglgraphics.h"
#include "configuration.h"
#include "graphicsmanager.h"
diff --git a/src/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 2b750ca82..2b489c985 100644
--- a/src/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -27,7 +27,7 @@
#if defined USE_OPENGL && !defined ANDROID
#include "localconsts.h"
-#include "graphics.h"
+#include "render/graphics.h"
#include "resources/fboinfo.h"
diff --git a/src/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index dd043018d..8030353eb 100644
--- a/src/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -23,7 +23,7 @@
#include "main.h"
#if defined USE_OPENGL
-#include "nullopenglgraphics.h"
+#include "render/nullopenglgraphics.h"
#include "configuration.h"
#include "graphicsmanager.h"
diff --git a/src/nullopenglgraphics.h b/src/render/nullopenglgraphics.h
index 76bce409a..856b646bc 100644
--- a/src/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -27,7 +27,7 @@
#if defined USE_OPENGL
#include "localconsts.h"
-#include "graphics.h"
+#include "render/graphics.h"
#include "resources/fboinfo.h"
diff --git a/src/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index 399af430c..1c7130475 100644
--- a/src/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -23,7 +23,7 @@
#include "main.h"
#if defined USE_OPENGL && !defined ANDROID
-#include "safeopenglgraphics.h"
+#include "render/safeopenglgraphics.h"
#include "configuration.h"
#include "graphicsmanager.h"
diff --git a/src/safeopenglgraphics.h b/src/render/safeopenglgraphics.h
index 7ae0c599a..2c31bb696 100644
--- a/src/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -26,7 +26,7 @@
#include "main.h"
#if defined USE_OPENGL && !defined ANDROID
-#include "graphics.h"
+#include "render/graphics.h"
#include "resources/fboinfo.h"
diff --git a/src/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index ee4e7dbce..218f2cad7 100644
--- a/src/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -22,7 +22,7 @@
#ifdef USE_SDL2
-#include "sdl2graphics.h"
+#include "render/sdl2graphics.h"
#include "main.h"
diff --git a/src/sdl2graphics.h b/src/render/sdl2graphics.h
index 3cb191d41..f3835e904 100644
--- a/src/sdl2graphics.h
+++ b/src/render/sdl2graphics.h
@@ -25,7 +25,7 @@
#ifdef USE_SDL2
-#include "graphics.h"
+#include "render/graphics.h"
#include "localconsts.h"
diff --git a/src/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index 084a0db34..9c410db8d 100644
--- a/src/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -22,7 +22,7 @@
#ifndef USE_SDL2
-#include "sdlgraphics.h"
+#include "render/sdlgraphics.h"
#include "main.h"
diff --git a/src/sdlgraphics.h b/src/render/sdlgraphics.h
index db2ad93a0..a7e4be85b 100644
--- a/src/sdlgraphics.h
+++ b/src/render/sdlgraphics.h
@@ -24,11 +24,11 @@
#define SDLGRAPHICS_H
#ifdef USE_SDL2
-#include "sdl2graphics.h"
+#include "render/sdl2graphics.h"
#else
-#include "graphics.h"
+#include "render/graphics.h"
#include "localconsts.h"
diff --git a/src/surfacegraphics.cpp b/src/render/surfacegraphics.cpp
index 0c9b6fa37..9a8e51891 100644
--- a/src/surfacegraphics.cpp
+++ b/src/render/surfacegraphics.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "surfacegraphics.h"
+#include "render/surfacegraphics.h"
#include "main.h"
diff --git a/src/surfacegraphics.h b/src/render/surfacegraphics.h
index 801c9079e..f5194946a 100644
--- a/src/surfacegraphics.h
+++ b/src/render/surfacegraphics.h
@@ -23,7 +23,7 @@
#ifndef SURFACEGRAPHICS_H
#define SURFACEGRAPHICS_H
-#include "graphics.h"
+#include "render/graphics.h"
#include "localconsts.h"
diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index ba10cbdcc..c619aafd9 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -21,7 +21,7 @@
#include "resources/ambientlayer.h"
-#include "graphics.h"
+#include "render/graphics.h"
#include "resources/image.h"
#include "resources/imagehelper.h"
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp
index 015ad0c93..b0ac91540 100644
--- a/src/resources/atlasmanager.cpp
+++ b/src/resources/atlasmanager.cpp
@@ -27,7 +27,8 @@
#include "client.h"
#include "graphicsmanager.h"
#include "logger.h"
-#include "surfacegraphics.h"
+
+#include "render/surfacegraphics.h"
#include "utils/mathutils.h"
#include "utils/physfsrwops.h"
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index 20fef77e3..faf1696b2 100644
--- a/src/resources/fboinfo.h
+++ b/src/resources/fboinfo.h
@@ -24,7 +24,7 @@
#include "main.h"
#ifdef USE_OPENGL
-#include "graphics.h"
+#include "render/graphics.h"
#include "resources/fboinfo.h"
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 71c29ba53..1ed19629c 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -26,9 +26,9 @@
#include "resources/resourcemanager.h"
#ifdef USE_OPENGL
-#include "mobileopenglgraphics.h"
-#include "normalopenglgraphics.h"
-#include "safeopenglgraphics.h"
+#include "render/mobileopenglgraphics.h"
+#include "render/normalopenglgraphics.h"
+#include "render/safeopenglgraphics.h"
#endif
#include "client.h"
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index abf05e800..7fa779fa8 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -29,9 +29,10 @@
#include "graphicsmanager.h"
#include "logger.h"
#include "mgl.h"
-#include "mobileopenglgraphics.h"
-#include "normalopenglgraphics.h"
-#include "safeopenglgraphics.h"
+
+#include "render/mobileopenglgraphics.h"
+#include "render/normalopenglgraphics.h"
+#include "render/safeopenglgraphics.h"
#include "resources/dye.h"
#include "resources/image.h"
diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp
index d3dec55d5..f9e8aea83 100644
--- a/src/resources/subimage.cpp
+++ b/src/resources/subimage.cpp
@@ -23,9 +23,9 @@
#include "resources/subimage.h"
#ifdef USE_OPENGL
-#include "mobileopenglgraphics.h"
-#include "normalopenglgraphics.h"
-#include "safeopenglgraphics.h"
+#include "render/mobileopenglgraphics.h"
+#include "render/normalopenglgraphics.h"
+#include "render/safeopenglgraphics.h"
#endif
#ifdef DEBUG_IMAGES
diff --git a/src/rotationalparticle.cpp b/src/rotationalparticle.cpp
index a5473044f..af04df1e7 100644
--- a/src/rotationalparticle.cpp
+++ b/src/rotationalparticle.cpp
@@ -22,9 +22,10 @@
#include "rotationalparticle.h"
-#include "graphics.h"
#include "simpleanimation.h"
+#include "render/graphics.h"
+
#include <math.h>
#include "debug.h"
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index af5ead79e..46052febc 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -22,9 +22,10 @@
#include "simpleanimation.h"
-#include "graphics.h"
#include "logger.h"
+#include "render/graphics.h"
+
#include "utils/stringutils.h"
#include "resources/animation.h"
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index 0781c101b..29b66e20e 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -25,9 +25,10 @@
#include "client.h"
#include "configuration.h"
#include "graphicsmanager.h"
-#include "sdlgraphics.h"
#include "soundmanager.h"
+#include "render/sdlgraphics.h"
+
#include "gui/theme.h"
#include "utils/gettext.h"
diff --git a/src/text.h b/src/text.h
index c235794e3..e515b3dc5 100644
--- a/src/text.h
+++ b/src/text.h
@@ -24,11 +24,12 @@
#ifndef TEXT_H
#define TEXT_H
-#include "graphics.h"
-#include "localconsts.h"
+#include "render/graphics.h"
#include <guichan/color.hpp>
+#include "localconsts.h"
+
class TextManager;
class Text
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index b7f00ed78..c573ca567 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -22,7 +22,7 @@
#include "textparticle.h"
-#include "graphics.h"
+#include "render/graphics.h"
#include "gui/theme.h"
diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp
index 8ffb8edb1..de6f459f6 100644
--- a/src/touchmanager.cpp
+++ b/src/touchmanager.cpp
@@ -21,12 +21,13 @@
#include "touchmanager.h"
#include "configuration.h"
-#include "graphics.h"
#include "graphicsvertexes.h"
#include "inputmanager.h"
#include "mouseinput.h"
#include "touchactions.h"
+#include "render/graphics.h"
+
#include "gui/theme.h"
#include "debug.h"
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 9684ebf7a..134f7ba1b 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -35,7 +35,7 @@
#include "utils/copynpaste.h"
-#include "graphics.h"
+#include "render/graphics.h"
#include "utils/sdlhelper.h"