13 files changed, 23 insertions, 13 deletions
diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp
index 199e547aa..df4814bc1 100644
--- a/src/render/mobileopengl2graphics.cpp
+++ b/src/render/mobileopengl2graphics.cpp
@@ -43,6 +43,7 @@
 
 #include "utils/delete2.h"
 #include "utils/foreach.h"
+#include "utils/performance.h"
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index d99f8b2a3..23163247c 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -41,6 +41,7 @@
 
 #include "resources/image/image.h"
 
+#include "utils/performance.h"
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index e5b8a7bce..a1237e130 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -45,6 +45,7 @@
 
 #include "utils/delete2.h"
 #include "utils/foreach.h"
+#include "utils/performance.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/sdlhelper.h"
 
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 06a765580..9fff18311 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -41,6 +41,7 @@
 
 #include "resources/image/image.h"
 
+#include "utils/performance.h"
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index e09f13b6b..470d35b83 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -36,6 +36,8 @@
 
 #include "resources/image/image.h"
 
+#include "utils/performance.h"
+
 #include "debug.h"
 
 GLuint NullOpenGLGraphics::mTextureBinded = 0;
diff --git a/src/render/opengl/mgl.hpp b/src/render/opengl/mgl.hpp
index 9dce907a4..4599c3855 100644
--- a/src/render/opengl/mgl.hpp
+++ b/src/render/opengl/mgl.hpp
@@ -140,6 +140,6 @@ defName(glTextureSubImage2D);
 defName(glTextureSubImage2DEXT);
 defName(glClearTexImage);
 defName(glClearTexSubImage);
-#ifdef WIN32
+#ifdef _WIN32
 defName(wglGetExtensionsString);
-#endif
+#endif // _WIN32
diff --git a/src/render/opengl/mglfunctions.h b/src/render/opengl/mglfunctions.h
index b583e3625..dfc31718b 100644
--- a/src/render/opengl/mglfunctions.h
+++ b/src/render/opengl/mglfunctions.h
@@ -28,7 +28,7 @@
 
 LOGGER_H
 
-#ifdef WIN32
+#ifdef _WIN32
 #define getFunction(name) wglGetProcAddress(name)
 #elif defined ANDROID
 #define getFunction(name) eglGetProcAddress(name)
@@ -38,10 +38,10 @@ LOGGER_H
 #define getFunction(name) glGetProcAddressREGAL(name)
 #elif defined(__SWITCH__)
 #define getFunction(name) SDL_GL_GetProcAddress(name)
-#else  // WIN32
+#else  // _WIN32
 #define getFunction(name) glXGetProcAddress(\
     reinterpret_cast<const GLubyte*>(name))
-#endif  // WIN32
+#endif  // _WIN32
 
 #define assignFunction(func) \
     { \
diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h
index 2d8759796..e3954aa1b 100644
--- a/src/render/opengl/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -231,11 +231,11 @@ typedef void (APIENTRY *glDebugMessageCallback_t) (GLDEBUGPROC_t callback,
     const void *userParam);
 
 
-#ifdef WIN32
+#ifdef _WIN32
 typedef const char* (APIENTRY * wglGetExtensionsString_t) (HDC hdc);
-#else  // WIN32
+#else  // _WIN32
 #define CALLBACK
-#endif  // WIN32
+#endif  // _WIN32
 
 #endif  // USE_OPENGL
 #endif  // RENDER_OPENGL_MGLTYPES_H
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index 4605a4e95..2c3d1f2bb 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -33,6 +33,7 @@
 
 #include "resources/image/image.h"
 
+#include "utils/performance.h"
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index f44901469..f25a5ef74 100644
--- a/src/render/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -77,6 +77,7 @@
 
 #include "resources/image/image.h"
 
+#include "utils/performance.h"
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index 35b7b7539..4f5e275f4 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -34,8 +34,8 @@
 
 #include "resources/image/image.h"
 
+#include "utils/performance.h"
 #include "utils/sdlcheckutils.h"
-
 #include "utils/sdlpixel.h"
 
 #include "debug.h"
diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index 558fbc734..910c511ee 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -27,16 +27,16 @@
 
 #include "graphicsmanager.h"
 
-#include "utils/sdlcheckutils.h"
-
-#include "utils/sdlpixel.h"
-
 #include "render/vertexes/imagecollection.h"
 
 #include "resources/imagerect.h"
 
 #include "resources/image/image.h"
 
+#include "utils/performance.h"
+#include "utils/sdlcheckutils.h"
+#include "utils/sdlpixel.h"
+
 #include "debug.h"
 
 #ifndef SDL_BIG_ENDIAN
diff --git a/src/render/surfacegraphics.cpp b/src/render/surfacegraphics.cpp
index 87676a37c..de539ffe8 100644
--- a/src/render/surfacegraphics.cpp
+++ b/src/render/surfacegraphics.cpp
@@ -29,6 +29,8 @@
 
 #include "resources/image/image.h"
 
+#include "utils/performance.h"
+
 #include "debug.h"
 
 SurfaceGraphics::SurfaceGraphics() :