diff --git a/radio/src/thirdparty/libopenui/src/libopenui_file.h b/radio/src/thirdparty/libopenui/src/libopenui_file.h
index 8bccd2ff6..e250a7a1b 100644
--- a/radio/src/thirdparty/libopenui/src/libopenui_file.h
+++ b/radio/src/thirdparty/libopenui/src/libopenui_file.h
@@ -19,9 +19,10 @@
 
 #pragma once
 
+#include "libopenui_defines.h" // for strcasecmp / VC++
 #include <string>
-#include <string.h>
-#include <inttypes.h>
+#include <cstring>
+#include <cinttypes>
 #include "ff.h"
 
 constexpr uint8_t LEN_FILE_EXTENSION_MAX = 5;  // longest used, including the dot, excluding null term.
diff --git a/radio/src/thirdparty/libopenui/src/libopenui_types.h b/radio/src/thirdparty/libopenui/src/libopenui_types.h
index d9b3177c3..4be8f4390 100644
--- a/radio/src/thirdparty/libopenui/src/libopenui_types.h
+++ b/radio/src/thirdparty/libopenui/src/libopenui_types.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <inttypes.h>
+#include <cinttypes>
 
 typedef int coord_t;