diff --git a/src/openrct2/common.h b/src/openrct2/common.h
index 6616e6b4cc..2532435eb1 100644
--- a/src/openrct2/common.h
+++ b/src/openrct2/common.h
@@ -30,8 +30,6 @@
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 
 using sint8 = int8_t;
diff --git a/src/openrct2/core/Console.cpp b/src/openrct2/core/Console.cpp
index 3660509e3c..9887f920e7 100644
--- a/src/openrct2/core/Console.cpp
+++ b/src/openrct2/core/Console.cpp
@@ -14,9 +14,10 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../platform/platform.h"
+#include <cstdio>
 
 #include "Console.hpp"
+#include "../platform/platform.h"
 
 namespace Console
 {
diff --git a/src/openrct2/core/Memory.hpp b/src/openrct2/core/Memory.hpp
index 0470613468..b391093c4d 100644
--- a/src/openrct2/core/Memory.hpp
+++ b/src/openrct2/core/Memory.hpp
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <cstdlib>
 #include <cstring>
 #include <typeinfo>
 #include "../common.h"
diff --git a/src/openrct2/drawing/Line.cpp b/src/openrct2/drawing/Line.cpp
index 30add7d39e..a7d67c68d4 100644
--- a/src/openrct2/drawing/Line.cpp
+++ b/src/openrct2/drawing/Line.cpp
@@ -90,7 +90,7 @@ void gfx_draw_line_software(rct_drawpixelinfo *dpi, sint32 x1, sint32 y1, sint32
     // Bresenham's algorithm
 
     // If vertical plot points upwards
-    sint32 steep = abs(y2 - y1) > abs(x2 - x1);
+    sint32 steep = std::abs(y2 - y1) > std::abs(x2 - x1);
     if (steep){
         sint32 temp_y2 = y2;
         sint32 temp_x2 = x2;
@@ -111,7 +111,7 @@ void gfx_draw_line_software(rct_drawpixelinfo *dpi, sint32 x1, sint32 y1, sint32
     }
 
     sint32 delta_x = x2 - x1;
-    sint32 delta_y = abs(y2 - y1);
+    sint32 delta_y = std::abs(y2 - y1);
     sint32 error = delta_x / 2;
     sint32 y_step;
     sint32 y = y1;