diff --git a/apps/plugin.c b/apps/plugin.c
index ec42d25a61..b62f6f3107 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -263,6 +263,7 @@ static const struct plugin_api rockbox_api = {
     font_load,
     font_unload,
     font_get,
+    font_measurestring,
     font_getstringsize,
     font_get_width,
     screen_clear_area,
@@ -319,6 +320,7 @@ static const struct plugin_api rockbox_api = {
     is_backlight_on,
     backlight_on,
     backlight_off,
+    backlight_set_on_button_hold,
     backlight_set_timeout,
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
     backlight_set_brightness,
@@ -335,6 +337,9 @@ static const struct plugin_api rockbox_api = {
 #if CONFIG_CHARGING
     remote_backlight_set_timeout_plugged,
 #endif
+#if defined(HAS_REMOTE_BUTTON_HOLD)
+    remote_backlight_set_on_button_hold,
+#endif
 #endif /* HAVE_REMOTE_LCD */
 #endif /* HAVE_BACKLIGHT */
 
@@ -381,6 +386,8 @@ static const struct plugin_api rockbox_api = {
     gesture_vel_reset,
     gesture_vel_process,
     gesture_vel_get,
+    gesture_flick_get_in_vp,
+    gesture_flick_get,
 #endif
     action_userabort,
     core_set_keyremap,
@@ -517,7 +524,9 @@ static const struct plugin_api rockbox_api = {
     set_sleeptimer_duration, /*stub*/
     get_sleep_timer, /*stub*/
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
+#if defined(CPU_COLDFIRE)
     system_memory_guard,
+#endif
     &cpu_frequency,
 
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
@@ -873,22 +882,12 @@ static const struct plugin_api rockbox_api = {
     path_strip_volume,
 #endif
 
-    /* new stuff at the end, sort into place next time
-       the API gets incompatible */
-    font_measurestring,
-#ifdef HAVE_TOUCHSCREEN
-    gesture_flick_get_in_vp,
-    gesture_flick_get,
-#endif
 #ifdef HAVE_HW_H264
     &target_hw_h264_api,
 #endif
-#ifdef HAVE_BACKLIGHT
-    backlight_set_on_button_hold,
-#endif
-#if defined(HAVE_REMOTE_LCD) && defined(HAS_REMOTE_BUTTON_HOLD)
-    remote_backlight_set_on_button_hold,
-#endif
+
+    /* new stuff at the end, sort into place next time
+       the API gets incompatible */
 };
 
 static int plugin_buffer_handle;
diff --git a/apps/plugin.h b/apps/plugin.h
index ab60404a3b..54fedf28ec 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -307,6 +307,8 @@ struct plugin_api {
     int (*font_load)(const char *path);
     void (*font_unload)(int font_id);
     struct font* (*font_get)(int font);
+    int (*font_measurestring)(const unsigned char *str, size_t maxbytes,
+                              size_t maxwidth, int *w, int *h, int fontnum);
     int  (*font_getstringsize)(const unsigned char *str, int *w, int *h,
                                int fontnumber);
     int (*font_get_width)(struct font* pf, ucschar_t char_code);
@@ -374,11 +376,11 @@ struct plugin_api {
     bool (*is_backlight_on)(bool ignore_always_off);
     void (*backlight_on)(void);
     void (*backlight_off)(void);
+    void (*backlight_set_on_button_hold)(int index);
     void (*backlight_set_timeout)(int index);
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
     void (*backlight_set_brightness)(int val);
 #endif /* HAVE_BACKLIGHT_BRIGHTNESS */
-
 #if CONFIG_CHARGING
     void (*backlight_set_timeout_plugged)(int index);
 #endif
@@ -390,6 +392,9 @@ struct plugin_api {
 #if CONFIG_CHARGING
     void (*remote_backlight_set_timeout_plugged)(int index);
 #endif
+#if defined(HAS_REMOTE_BUTTON_HOLD)
+    void (*remote_backlight_set_on_button_hold)(int index);
+#endif
 #endif /* HAVE_REMOTE_LCD */
 #endif /* HAVE_BACKLIGHT */
 
@@ -451,6 +456,9 @@ struct plugin_api {
     void (*gesture_vel_process)(struct gesture_vel *gv,
                                 const struct touchevent *ev);
     bool (*gesture_vel_get)(struct gesture_vel *gv, int *xvel, int *yvel);
+    int (*gesture_flick_get_in_vp)(const struct gesture_event *gevt,
+                                   const struct viewport *vp);
+    int (*gesture_flick_get)(const struct gesture_event *gevt);
 #endif
     bool (*action_userabort)(int timeout);
     int (*core_set_keyremap)(struct button_mapping* core_keymap, int count);
@@ -603,7 +611,9 @@ struct plugin_api {
     void (*set_sleeptimer_duration)(int minutes);
     int (*get_sleep_timer)(void);
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
+#if defined(CPU_COLDFIRE)
     int (*system_memory_guard)(int newmode);
+#endif
     long *cpu_frequency;
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 #ifdef CPU_BOOST_LOGGING
@@ -1038,24 +1048,12 @@ struct plugin_api {
     int (*path_strip_volume)(const char *name, const char **nameptr, bool greedy);
 #endif
 
-    /* new stuff at the end, sort into place next time
-       the API gets incompatible */
-    int (*font_measurestring)(const unsigned char *str, size_t maxbytes,
-                              size_t maxwidth, int *w, int *h, int fontnum);
-#ifdef HAVE_TOUCHSCREEN
-    int (*gesture_flick_get_in_vp)(const struct gesture_event *gevt,
-                                   const struct viewport *vp);
-    int (*gesture_flick_get)(const struct gesture_event *gevt);
-#endif
 #ifdef HAVE_HW_H264
     const struct hw_h264_api *hw_h264;
 #endif
-#ifdef HAVE_BACKLIGHT
-    void (*backlight_set_on_button_hold)(int index);
-#endif
-#if defined(HAVE_REMOTE_LCD) && defined(HAS_REMOTE_BUTTON_HOLD)
-    void (*remote_backlight_set_on_button_hold)(int index);
-#endif
+
+    /* new stuff at the end, sort into place next time
+       the API gets incompatible */
 };
 
 /* plugin header */
diff --git a/docs/PLUGIN_API b/docs/PLUGIN_API
index afe701efe2..38a584034a 100644
--- a/docs/PLUGIN_API
+++ b/docs/PLUGIN_API
@@ -2663,7 +2663,7 @@ char* strtok_r(char *ptr, const char *sep, char **end)
 
 int system_memory_guard(int newmode)
     \group kernel/ system
-    \conditions ((CONFIG_PLATFORM & PLATFORM_NATIVE))
+    \conditions ((CONFIG_PLATFORM & PLATFORM_NATIVE) && defined(CPU_COLDFIRE))
     \param newmode
     \return
     \description
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c
index aced3e2b80..c57544d7aa 100644
--- a/firmware/target/arm/as3525/system-as3525.c
+++ b/firmware/target/arm/as3525/system-as3525.c
@@ -398,12 +398,6 @@ void system_exception_wait(void)
     while(!button_read_device());
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 /* usecs may be at most 2^32/248 (17 seconds) for 248MHz max cpu freq */
 void udelay(unsigned usecs)
 {
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c
index 0bb62639d0..3b79aa079c 100644
--- a/firmware/target/arm/imx233/system-imx233.c
+++ b/firmware/target/arm/imx233/system-imx233.c
@@ -154,12 +154,6 @@ void system_exception_wait(void)
     while(imx233_power_read_pswitch() != 0) {}
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 static void set_page_tables(void)
 {
     /* map every memory region to itself */
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
index 4ae9439134..e3a4c722d0 100644
--- a/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
@@ -174,12 +174,6 @@ void gpt_stop(void)
     restore_interrupt(status);
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 void system_halt(void)
 {
     disable_interrupt(IRQ_FIQ_STATUS);
diff --git a/firmware/target/arm/pp/system-pp5002.c b/firmware/target/arm/pp/system-pp5002.c
index 75f99674d7..1cf284c294 100644
--- a/firmware/target/arm/pp/system-pp5002.c
+++ b/firmware/target/arm/pp/system-pp5002.c
@@ -235,9 +235,3 @@ void system_exception_wait(void)
     sleep_core(CURRENT_CORE);
     while (1);
 }
-
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
diff --git a/firmware/target/arm/pp/system-pp502x.c b/firmware/target/arm/pp/system-pp502x.c
index e8834061e1..ef69a459ec 100644
--- a/firmware/target/arm/pp/system-pp502x.c
+++ b/firmware/target/arm/pp/system-pp502x.c
@@ -664,9 +664,3 @@ void system_exception_wait(void)
     PROC_CTL(CURRENT_CORE) = 0x40000000;
     while (1);
 }
-
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
diff --git a/firmware/target/arm/rk27xx/system-rk27xx.c b/firmware/target/arm/rk27xx/system-rk27xx.c
index 0d71915a00..6b88d86840 100644
--- a/firmware/target/arm/rk27xx/system-rk27xx.c
+++ b/firmware/target/arm/rk27xx/system-rk27xx.c
@@ -173,12 +173,6 @@ void system_exception_wait(void)
     while(!button_read_device());
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 /* usecs may be at most 2^32/200 (~21 seconds) for 200MHz max cpu freq */
 void udelay(unsigned usecs)
 {
diff --git a/firmware/target/arm/s3c2440/system-s3c2440.c b/firmware/target/arm/s3c2440/system-s3c2440.c
index 938ee0276a..060065e20d 100644
--- a/firmware/target/arm/s3c2440/system-s3c2440.c
+++ b/firmware/target/arm/s3c2440/system-s3c2440.c
@@ -195,12 +195,6 @@ void system_init(void)
 #endif
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 
 void set_cpu_frequency(long frequency)
diff --git a/firmware/target/arm/s5l8700/system-s5l8700.c b/firmware/target/arm/s5l8700/system-s5l8700.c
index eb9dd09881..81d574bfef 100644
--- a/firmware/target/arm/s5l8700/system-s5l8700.c
+++ b/firmware/target/arm/s5l8700/system-s5l8700.c
@@ -207,12 +207,6 @@ void system_exception_wait(void)
     while(1);
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 
 void set_cpu_frequency(long frequency)
diff --git a/firmware/target/arm/s5l8702/system-s5l8702.c b/firmware/target/arm/s5l8702/system-s5l8702.c
index 8b6a314ce9..0a6548dd8d 100644
--- a/firmware/target/arm/s5l8702/system-s5l8702.c
+++ b/firmware/target/arm/s5l8702/system-s5l8702.c
@@ -267,12 +267,6 @@ void system_exception_wait(void)
     while(1);
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 void set_cpu_frequency(long frequency)
 {
diff --git a/firmware/target/arm/stm32/system-stm32h7.c b/firmware/target/arm/stm32/system-stm32h7.c
index c1c311c18e..cbc731de4c 100644
--- a/firmware/target/arm/stm32/system-stm32h7.c
+++ b/firmware/target/arm/stm32/system-stm32h7.c
@@ -156,10 +156,3 @@ void udelay(uint32_t us)
         start = value;
     }
 }
-
-int system_memory_guard(int newmode)
-{
-    /* TODO -- maybe use MPU here to give some basic protection */
-    (void)newmode;
-    return MEMGUARD_NONE;
-}
diff --git a/firmware/target/arm/tcc780x/system-tcc780x.c b/firmware/target/arm/tcc780x/system-tcc780x.c
index 55b87f1db3..c049b308c6 100644
--- a/firmware/target/arm/tcc780x/system-tcc780x.c
+++ b/firmware/target/arm/tcc780x/system-tcc780x.c
@@ -294,12 +294,6 @@ void system_exception_wait(void)
 #endif
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 
 void set_cpu_frequency(long frequency)
diff --git a/firmware/target/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c
index edbe14fc33..b47aa4ac16 100644
--- a/firmware/target/arm/tms320dm320/system-dm320.c
+++ b/firmware/target/arm/tms320dm320/system-dm320.c
@@ -393,12 +393,6 @@ void system_init(void)
 #endif
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 void set_cpu_frequency(long frequency)
 {
diff --git a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
index bf0e46138b..a854f6bf8c 100644
--- a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
@@ -500,12 +500,6 @@ void system_init(void)
 {
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 void set_cpu_frequency(long frequency)
 {
diff --git a/firmware/target/mips/ingenic_jz47xx/system-jz4760.c b/firmware/target/mips/ingenic_jz47xx/system-jz4760.c
index 7d2a5c7109..aa2e8330fd 100644
--- a/firmware/target/mips/ingenic_jz47xx/system-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/system-jz4760.c
@@ -733,12 +733,6 @@ void system_init(void)
 {
 }
 
-int system_memory_guard(int newmode)
-{
-    (void)newmode;
-    return 0;
-}
-
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 void set_cpu_frequency(long frequency)
 {
diff --git a/firmware/target/mips/ingenic_x1000/system-x1000.c b/firmware/target/mips/ingenic_x1000/system-x1000.c
index ec94c7236f..36f2a9fc9a 100644
--- a/firmware/target/mips/ingenic_x1000/system-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/system-x1000.c
@@ -196,13 +196,6 @@ void system_reboot(void)
     while(1);
 }
 
-int system_memory_guard(int mode)
-{
-    /* unused */
-    (void)mode;
-    return 0;
-}
-
 /* Simple delay API -- slow path functions */
 
 void __udelay(uint32_t us)