1 files changed, 60 insertions, 49 deletions

diff --git a/apps/features.txt b/apps/features.txt
index ef866a9eb1..6ca8d0894b 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -16,20 +16,10 @@ agc
 alarm
 #endif
 
-#if defined(HAVE_ALBUMART)
-albumart
-#endif
-
 #if defined(HAVE_BACKLIGHT_BRIGHTNESS)
 backlight_brightness
 #endif
 
-#if defined(HAVE_BACKLIGHT_FADING_INT_SETTING)
-backlight_fade_int
-#elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING)
-backlight_fade_bool
-#endif
-
 #if BATTERY_TYPES_COUNT > 1
 battery_types
 #endif
@@ -54,10 +44,6 @@ dircache
 flash_storage
 #endif
 
-#if defined(HAVE_DISK_STORAGE)
-disk_storage
-#endif
-
 #if defined(HAVE_HEADPHONE_DETECTION)
 headphone_detection
 #endif
@@ -66,10 +52,6 @@ headphone_detection
 hold_button
 #endif
 
-#if defined(HAS_REMOTE_BUTTON_HOLD)
-remote_button_hold
-#endif
-
 #if defined(HAVE_HOTKEY)
 hotkey
 #endif
@@ -78,10 +60,6 @@ hotkey
 lcd_bitmap
 #endif
 
-#if defined(HAVE_LCD_CHARCELLS)
-lcd_charcell
-#endif
-
 #if LCD_DEPTH > 1
 lcd_non-mono
 #endif
@@ -90,10 +68,6 @@ lcd_non-mono
 lcd_color
 #endif
 
-#if defined(HAVE_LCD_FLIP)
-lcd_flip
-#endif
-
 #if defined(HAVE_LCD_INVERT)
 lcd_invert
 #endif
@@ -102,10 +76,6 @@ lcd_invert
 lcd_sleep
 #endif
 
-#if defined(HAVE_LCD_CONTRAST)
-lcd_contrast
-#endif
-
 #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
 masf
 #endif
@@ -176,10 +146,6 @@ remote_ticking
 rtc
 #endif
 
-#if defined(HAVE_SCROLLWHEEL)
-scrollwheel
-#endif
-
 #if defined(IPOD_ACCESSORY_PROTOCOL)
 serial_port
 #endif
@@ -217,21 +183,6 @@ usb_charging_enable
 #endif
 #endif
 
-#if defined(HAVE_USB_POWER)
-usb_power
-#endif
-
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
-usbstack
-#endif
-
-#if defined(USB_ENABLE_HID)
-usb_hid
-#if defined(HAVE_USB_HID_MOUSE)
-usb_hid_mouse
-#endif
-#endif
-
 #if defined(HAVE_WHEEL_ACCELERATION)
 wheel_acceleration
 #endif
@@ -244,6 +195,66 @@ lineout_poweroff
 touchscreen
 #endif
 
+
+
+
+/* These features are only used by the manual so they won't break binary
+ * compatibility
+ */
+
 #if (PLUGIN_BUFFER_SIZE >= 0x80000)
 large_plugin_buffer
 #endif
+
+#if defined(AB_REPEAT_ENABLE) && !defined(ACTION_WPSAB_SINGLE)
+ab_repeat_buttons
+#endif
+
+#if defined(HAVE_ALBUMART)
+albumart
+#endif
+
+#if defined(HAVE_BACKLIGHT_FADING_INT_SETTING)
+backlight_fade_int
+#elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING)
+backlight_fade_bool
+#endif
+
+#if defined(HAVE_DISK_STORAGE)
+disk_storage
+#endif
+
+#if defined(HAS_REMOTE_BUTTON_HOLD)
+remote_button_hold
+#endif
+
+#if defined(HAVE_LCD_CHARCELLS)
+lcd_charcell
+#endif
+
+#if defined(HAVE_LCD_FLIP)
+lcd_flip
+#endif
+
+#if defined(HAVE_LCD_CONTRAST)
+lcd_contrast
+#endif
+
+#if defined(HAVE_SCROLLWHEEL)
+scrollwheel
+#endif
+
+#if defined(HAVE_USB_POWER)
+usb_power
+#endif
+
+#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+usbstack
+#endif
+
+#if defined(USB_ENABLE_HID)
+usb_hid
+#if defined(HAVE_USB_HID_MOUSE)
+usb_hid_mouse
+#endif
+#endif