diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index bd95d508f6..a0966bf3d1 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -1189,24 +1189,6 @@ struct retro_led_interface
                                             * Returns a MIDI interface that can be used for raw data I/O.
                                             */
 
-#define RETRO_ENVIRONMENT_GET_FASTFORWARDING (49 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                            /* bool * --
-                                            * Boolean value that indicates whether or not the frontend is in 
-                                            * fastforwarding mode.
-                                            */
-
-#define RETRO_ENVIRONMENT_SET_SAVE_STATE_IN_BACKGROUND (50 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                            /* bool * --
-                                            * Boolean value that tells the front end to save states in the
-                                            * background or not.
-                                            */
-
-#define RETRO_ENVIRONMENT_GET_CLEAR_ALL_THREAD_WAITS_CB (51 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                            /* retro_environment_t * --
-                                            * Provides the callback to the frontend method which will cancel
-                                            * all currently waiting threads.  Used when coordination is needed
-                                            * between the core and the frontend to gracefully stop all threads.
-                                            */
 
 
 /* Retrieves the current state of the MIDI input.
diff --git a/retroarch.h b/retroarch.h
index 46d882deed..9d8823ea26 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -33,6 +33,27 @@
 
 RETRO_BEGIN_DECLS
 
+#define RETRO_ENVIRONMENT_RETROARCH_START_BLOCK 0x800000
+
+#define RETRO_ENVIRONMENT_GET_FASTFORWARDING (1 | RETRO_ENVIRONMENT_RETROARCH_START_BLOCK)
+                                            /* bool * --
+                                            * Boolean value that indicates whether or not the frontend is in
+                                            * fastforwarding mode.
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_SAVE_STATE_IN_BACKGROUND (2 | RETRO_ENVIRONMENT_RETROARCH_START_BLOCK)
+                                            /* bool * --
+                                            * Boolean value that tells the front end to save states in the
+                                            * background or not.
+                                            */
+
+#define RETRO_ENVIRONMENT_GET_CLEAR_ALL_THREAD_WAITS_CB (3 | RETRO_ENVIRONMENT_RETROARCH_START_BLOCK)
+                                            /* retro_environment_t * --
+                                            * Provides the callback to the frontend method which will cancel
+                                            * all currently waiting threads.  Used when coordination is needed
+                                            * between the core and the frontend to gracefully stop all threads.
+                                            */
+
 enum rarch_ctl_state
 {
    RARCH_CTL_NONE = 0,