diff --git a/input/input_driver.c b/input/input_driver.c
index 37fd2b3c4b..16b05f6bc5 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "../command.h"
+#include "../driver.h"
 #include "../retroarch.h"
 #include "../verbosity.h"
 #include "../configuration.h"
diff --git a/libretro-common/audio/conversion/float_to_s16.c b/libretro-common/audio/conversion/float_to_s16.c
index 75cdfd5aab..770981d9c1 100644
--- a/libretro-common/audio/conversion/float_to_s16.c
+++ b/libretro-common/audio/conversion/float_to_s16.c
@@ -85,7 +85,7 @@ void convert_float_to_s16(int16_t *out,
 
 void convert_float_to_s16_init_simd(void)
 {
-   unsigned cpu = cpu_features_get();
+   uint64_t cpu = cpu_features_get();
 
    if (cpu & RETRO_SIMD_NEON)
       float_to_s16_neon_enabled = true;
diff --git a/libretro-common/audio/conversion/s16_to_float.c b/libretro-common/audio/conversion/s16_to_float.c
index 64c0c39e3c..03a836dea6 100644
--- a/libretro-common/audio/conversion/s16_to_float.c
+++ b/libretro-common/audio/conversion/s16_to_float.c
@@ -84,7 +84,7 @@ void convert_s16_to_float(float *out,
 
 void convert_s16_to_float_init_simd(void)
 {
-   unsigned cpu = cpu_features_get();
+   uint64_t cpu = cpu_features_get();
 
    if (cpu & RETRO_SIMD_NEON)
       s16_to_float_neon_enabled = true;