diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e9c8e9ae9b..ec2a360c36 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1453,7 +1453,7 @@ source_group("Rendering\\Hardware Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_
 source_group("Rendering\\Hardware Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/shaders/.+")
 source_group("Rendering\\Hardware Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/system/.+")
 source_group("Rendering\\Hardware Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/textures/.+")
-source_group("Rendering\\Hardware Renderer\\Utilities" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/hwrenderer/utility/.+")
+source_group("Rendering\\Hardware Renderer\\Utilities" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/utility/.+")
 source_group("Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl_load/.+")
 source_group("Rendering\\OpenGL Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/.+")
 source_group("Rendering\\OpenGL Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/data/.+")
@@ -1499,6 +1499,9 @@ source_group("Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sc
 source_group("Scripting" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/.+")
 source_group("Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/.+")
 source_group("Utility\\Node Builder" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/nodebuilder/.+")
+source_group("Utility\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/math/.+")
+source_group("Utility\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/rapidjson/.+")
+source_group("Utility\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/sfmt/.+")
 source_group("Shared Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_shared/.+")
 source_group("Statusbar" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_statusbar/.+")
 source_group("Versioning" FILES version.h win32/zdoom.rc)
diff --git a/src/g_statusbar/sbarinfo.cpp b/src/g_statusbar/sbarinfo.cpp
index 60c68448f7..22f6d9ae45 100644
--- a/src/g_statusbar/sbarinfo.cpp
+++ b/src/g_statusbar/sbarinfo.cpp
@@ -47,7 +47,7 @@
 #include "gstrings.h"
 #include "g_levellocals.h"
 #include "vm.h"
-#include "i_system.h"""
+#include "i_system.h"
 
 #define ARTIFLASH_OFFSET (statusBar->invBarOffset+6)
 enum
diff --git a/src/utility/m_png.cpp b/src/utility/m_png.cpp
index 06cf4ce2e7..df2ec58601 100644
--- a/src/utility/m_png.cpp
+++ b/src/utility/m_png.cpp
@@ -44,7 +44,6 @@
 #include "m_swap.h"
 #include "c_cvars.h"
 #include "r_defs.h"
-#include "v_video.h"
 #include "m_png.h"
 
 // MACROS ------------------------------------------------------------------
diff --git a/src/utility/m_random.cpp b/src/utility/m_random.cpp
index 5b77bccaf3..9a765b8515 100644
--- a/src/utility/m_random.cpp
+++ b/src/utility/m_random.cpp
@@ -62,7 +62,6 @@
 #include "doomstat.h"
 #include "m_random.h"
 #include "serializer.h"
-#include "b_bot.h"
 #include "m_crc32.h"
 #include "c_dispatch.h"