diff --git a/griffin/griffin.c b/griffin/griffin.c
index 6e6323ffa2..ac0f1a24e9 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -864,6 +864,7 @@ AUDIO RESAMPLER
 /*============================================================
 CAMERA
 ============================================================ */
+#include "../camera/camera_driver.c"
 #if defined(ANDROID)
 #include "../camera/drivers/android.c"
 #elif defined(EMSCRIPTEN)
diff --git a/retroarch.c b/retroarch.c
index 3093155821..e2bb61314d 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -7340,7 +7340,6 @@ static core_option_manager_t *runloop_init_core_variables(
 bool runloop_environment_cb(unsigned cmd, void *data)
 {
    unsigned p;
-   struct rarch_state *p_rarch            = &rarch_st;
    runloop_state_t *runloop_st            = &runloop_state;
    recording_state_t *recording_st        = recording_state_get_ptr();
 
@@ -9610,8 +9609,6 @@ bool libretro_get_shared_context(void)
 static void uninit_libretro_symbols(
       struct retro_core_t *current_core)
 {
-   struct rarch_state 
-      *p_rarch         = &rarch_st;
    runloop_state_t 
 	   *runloop_st      = &runloop_state;
    input_driver_state_t