diff --git a/core/hw/sh4/dyna/shil_canonical.h b/core/hw/sh4/dyna/shil_canonical.h
index 9971e80e8..f03c82c6a 100644
--- a/core/hw/sh4/dyna/shil_canonical.h
+++ b/core/hw/sh4/dyna/shil_canonical.h
@@ -97,7 +97,7 @@ extern "C" f32 fipr_asm(float* fn, float* fm);
 
 #if SHIL_MODE==1 || SHIL_MODE==2
 //only in structs we use the code :)
-#include <math.h>
+#include <cmath>
 #include "types.h"
 #include "shil.h"
 #include "decoder.h"
diff --git a/core/hw/sh4/modules/serial.cpp b/core/hw/sh4/modules/serial.cpp
index 3f9b987c1..504fe0cad 100644
--- a/core/hw/sh4/modules/serial.cpp
+++ b/core/hw/sh4/modules/serial.cpp
@@ -2,9 +2,9 @@
 	Dreamcast serial port.
 	This is missing most of the functionality, but works for KOS (And thats all that uses it)
 */
-#include <stdlib.h>
+#include <cerrno>
+#include <cstdlib>
 #include <fcntl.h>
-#include <errno.h>
 #ifndef _WIN32
 #include <unistd.h>
 #include <sys/ioctl.h>
diff --git a/core/imgread/ioctl.cpp b/core/imgread/ioctl.cpp
index 01e303087..019d81ade 100644
--- a/core/imgread/ioctl.cpp
+++ b/core/imgread/ioctl.cpp
@@ -3,7 +3,7 @@
 #ifdef _WIN32
 #include "common.h"
 
-#include <stddef.h>
+#include <cstddef>
 #include <windows.h>
 
 #include <ntddscsi.h>