diff --git a/dynamic.c b/dynamic.c
index a6d3074013..64d6a3890d 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -496,8 +496,9 @@ bool libretro_get_system_info(const char *path,
  * Setup libretro callback symbols. Returns true on success,
  * or false if symbols could not be loaded.
  **/
-bool init_libretro_sym_custom(enum rarch_core_type type, struct retro_core_t *current_core, const char *lib_path, dylib_t *lib_handle_p)
+bool init_libretro_sym_custom(enum rarch_core_type type, struct retro_core_t *current_core, const char *lib_path, void *_lib_handle_p)
 {
+   dylib_t *lib_handle_p = (dylib_t*)_lib_handle_p;
 #ifdef HAVE_DYNAMIC
    /* the library handle for use with the SYMBOL macro */
    dylib_t lib_handle_local;
diff --git a/dynamic.h b/dynamic.h
index 2138927f58..a879e38d71 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -20,7 +20,6 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 #include <libretro.h>
-#include <dynamic/dylib.h>
 
 #include "core_type.h"
 
@@ -133,7 +132,7 @@ bool libretro_get_shared_context(void);
 bool init_libretro_sym(enum rarch_core_type type,
       struct retro_core_t *core);
 
-bool init_libretro_sym_custom(enum rarch_core_type type, struct retro_core_t *current_core, const char *lib_path, dylib_t *lib_handle_p);
+bool init_libretro_sym_custom(enum rarch_core_type type, struct retro_core_t *current_core, const char *lib_path, void *lib_handle_p);
 
 /**
  * uninit_libretro_sym:
diff --git a/runahead/dirty_input.c b/runahead/dirty_input.c
index 7aa33f632c..f167692b43 100644
--- a/runahead/dirty_input.c
+++ b/runahead/dirty_input.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 
 #include <boolean.h>
+#include <dynamic/dylib.h>
 
 #include "../core.h"
 #include "../dynamic.h"
@@ -98,9 +99,7 @@ static void input_state_set_last(unsigned port, unsigned device,
          )
       {
          if (id >= element->state_size)
-         {
             InputListElementExpand(element, id);
-         }
          element->state[id] = value;
          return;
       }
diff --git a/runahead/mylist.h b/runahead/mylist.h
index be9a12d8dd..ec0238912d 100644
--- a/runahead/mylist.h
+++ b/runahead/mylist.h
@@ -4,6 +4,7 @@
 #include <stddef.h>
 #include <boolean.h>
 #include <retro_common_api.h>
+#include <dynamic/dylib.h>
 
 RETRO_BEGIN_DECLS