diff --git a/reactos/tools/sysreg/rosboot_test.cpp b/reactos/tools/sysreg/rosboot_test.cpp
index 502aaf7b43e..c93b01d984d 100644
--- a/reactos/tools/sysreg/rosboot_test.cpp
+++ b/reactos/tools/sysreg/rosboot_test.cpp
@@ -20,13 +20,14 @@
 #include <iostream>
 #include <vector>
 #include <fstream>
-#include <time.h>
-#include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
-#include <signal.h>
+#include <cassert>
+#include <cfloat>
+#include <cmath>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 #ifndef __LINUX__
 #include <io.h>
 #include <errno.h>
diff --git a/reactos/tools/sysreg/rosboot_test.h b/reactos/tools/sysreg/rosboot_test.h
index 640ff5e2264..1b0ea2dc802 100644
--- a/reactos/tools/sysreg/rosboot_test.h
+++ b/reactos/tools/sysreg/rosboot_test.h
@@ -117,7 +117,7 @@ namespace Sysreg_
 
 	void dumpCheckpoints();
 
-typedef enum DebugState
+enum DebugState
 {
 	DebugStateContinue = 1, /* continue debugging */
 	DebugStateBSODDetected, /* bsod detected */