diff --git a/gfx/common/win32_common.h b/gfx/common/win32_common.h
index 29d4174953..14dded9896 100644
--- a/gfx/common/win32_common.h
+++ b/gfx/common/win32_common.h
@@ -174,12 +174,8 @@ LRESULT CALLBACK wnd_proc_d3d_common(HWND hwnd, UINT message,
 #endif
 
 #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGL_CORE)
-LRESULT CALLBACK wnd_proc_wgl_dinput(HWND hwnd, UINT message,
-      WPARAM wparam, LPARAM lparam);
 LRESULT CALLBACK wnd_proc_wgl_winraw(HWND hwnd, UINT message,
       WPARAM wparam, LPARAM lparam);
-LRESULT CALLBACK wnd_proc_wgl_common(HWND hwnd, UINT message,
-      WPARAM wparam, LPARAM lparam);
 #endif
 
 #if defined(HAVE_VULKAN)
diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
index edf5969c9c..6d6a40d484 100644
--- a/gfx/drivers_context/wgl_ctx.c
+++ b/gfx/drivers_context/wgl_ctx.c
@@ -84,6 +84,12 @@
 #endif
 #endif
 
+/* Forward declarations */
+LRESULT CALLBACK wnd_proc_wgl_common(HWND hwnd, UINT message,
+      WPARAM wparam, LPARAM lparam);
+LRESULT CALLBACK wnd_proc_wgl_dinput(HWND hwnd, UINT message,
+      WPARAM wparam, LPARAM lparam);
+
 static BOOL (APIENTRY *p_swap_interval)(int);
 
 enum wgl_flags
diff --git a/input/input_driver.c b/input/input_driver.c
index a100cae414..c9465c862b 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -4795,8 +4795,12 @@ void bsv_movie_next_frame(input_driver_state_t *input_st)
    unsigned checkpoint_interval   = settings->uints.replay_checkpoint_interval;
    bsv_movie_t         *handle    = input_st->bsv_movie_state_handle;
 
-   if (!handle || state_manager_frame_is_reversed())
+   if (!handle)
       return;
+#ifdef HAVE_REWIND
+   if (state_manager_frame_is_reversed())
+      return;
+#endif
 
    if (input_st->bsv_movie_state.flags & BSV_FLAG_MOVIE_RECORDING)
    {
diff --git a/tasks/task_save.c b/tasks/task_save.c
index b082ef718c..9aa04fc740 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -685,7 +685,12 @@ static bool content_write_serialized_state(void* buffer,
 #ifdef HAVE_BSV_MOVIE
     {
        input_driver_state_t *input_st = input_state_get_ptr();
-       if (!rewind && input_st->bsv_movie_state.flags & (BSV_FLAG_MOVIE_RECORDING | BSV_FLAG_MOVIE_PLAYBACK) && !state_manager_frame_is_reversed())
+#ifdef HAVE_REWIND
+       bool frame_is_reversed         = state_manager_frame_is_reversed();
+#else
+       bool frame_is_reversed         = false;
+#endif
+       if (!rewind && input_st->bsv_movie_state.flags & (BSV_FLAG_MOVIE_RECORDING | BSV_FLAG_MOVIE_PLAYBACK) && !frame_is_reversed)
        {
           content_write_block_header(output,
              RASTATE_REPLAY_BLOCK, size->replay_size);
@@ -1128,13 +1133,19 @@ static bool content_load_rastate1(unsigned char* input, size_t size)
 #ifdef HAVE_BSV_MOVIE
          {
             input_driver_state_t *input_st = input_state_get_ptr();
-            if (BSV_MOVIE_IS_RECORDING() && !seen_replay && !state_manager_frame_is_reversed())
+#ifdef HAVE_REWIND
+            bool frame_is_reversed         = state_manager_frame_is_reversed();
+#else
+            bool frame_is_reversed         = false;
+#endif
+
+            if (BSV_MOVIE_IS_RECORDING() && !seen_replay && !frame_is_reversed)
             {
                /* TODO OSD message */
                RARCH_ERR("[Replay] Can't load state without replay data during recording.\n");
                return false;
             }
-            if (BSV_MOVIE_IS_PLAYBACK_ON() && !seen_replay && !state_manager_frame_is_reversed())
+            if (BSV_MOVIE_IS_PLAYBACK_ON() && !seen_replay && !frame_is_reversed)
             {
                /* TODO OSD message */
                RARCH_WARN("[Replay] Loading state without replay data during replay will cancel replay.\n");
@@ -1158,7 +1169,12 @@ static bool content_load_rastate1(unsigned char* input, size_t size)
       else if (memcmp(marker, RASTATE_REPLAY_BLOCK, 4) == 0)
       {
          input_driver_state_t *input_st = input_state_get_ptr();
-         if (state_manager_frame_is_reversed() || replay_set_serialized_data((void*)input))
+#ifdef HAVE_REWIND
+         bool frame_is_reversed         = state_manager_frame_is_reversed();
+#else
+         bool frame_is_reversed         = false;
+#endif
+         if (frame_is_reversed || replay_set_serialized_data((void*)input))
             seen_replay = true;
          else
             return false;
@@ -1180,8 +1196,15 @@ static bool content_load_rastate1(unsigned char* input, size_t size)
       rcheevos_set_serialized_data(NULL);
 #endif
 #ifdef HAVE_BSV_MOVIE
-   if (!seen_replay && !state_manager_frame_is_reversed())
-      replay_set_serialized_data(NULL);
+   {
+#ifdef HAVE_REWIND
+      bool frame_is_reversed = state_manager_frame_is_reversed();
+#else
+      bool frame_is_reversed = false;
+#endif
+      if (!seen_replay && !frame_is_reversed)
+         replay_set_serialized_data(NULL);
+   }
 #endif
 
    return true;
@@ -1203,8 +1226,15 @@ bool content_deserialize_state(
       rcheevos_set_serialized_data(NULL);
 #endif
 #ifdef HAVE_BSV_MOVIE
-      if(!state_manager_frame_is_reversed())
-         replay_set_serialized_data(NULL);
+      {
+#ifdef HAVE_REWIND
+         bool frame_is_reversed = state_manager_frame_is_reversed();
+#else
+         bool frame_is_reversed = false;
+#endif
+         if (!frame_is_reversed)
+            replay_set_serialized_data(NULL);
+      }
 #endif
    }
    else
diff --git a/tasks/task_wifi.c b/tasks/task_wifi.c
index 0279499f2f..21f0591fbf 100644
--- a/tasks/task_wifi.c
+++ b/tasks/task_wifi.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <compat/strl.h>
 #include <retro_miscellaneous.h>