4 files changed, 18 insertions, 18 deletions

diff --git a/apps/codecs.c b/apps/codecs.c
index 4fcf9ce02f..565adcf203 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -101,6 +101,9 @@ struct codec_api ci = {
     NULL, /* configure */
     
     /* kernel/ system */
+#ifdef CPU_ARM
+    __div0,
+#endif
     PREFIX(sleep),
     yield,
 
@@ -169,9 +172,6 @@ struct codec_api ci = {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-#ifdef CPU_ARM
-    __div0,
-#endif
 };
 
 void codec_get_full_path(char *path, const char *codec_root_fn)
diff --git a/apps/codecs.h b/apps/codecs.h
index c2358e1750..631cf58a77 100644
--- a/apps/codecs.h
+++ b/apps/codecs.h
@@ -75,12 +75,12 @@
 #define CODEC_ENC_MAGIC 0x52454E43 /* RENC */
 
 /* increase this every time the api struct changes */
-#define CODEC_API_VERSION 31
+#define CODEC_API_VERSION 32
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
    new function which are "waiting" at the end of the function table) */
-#define CODEC_MIN_API_VERSION 30
+#define CODEC_MIN_API_VERSION 32
 
 /* codec return codes */
 enum codec_status {
@@ -153,6 +153,9 @@ struct codec_api {
     void (*configure)(int setting, intptr_t value);
 
     /* kernel/ system */
+#ifdef CPU_ARM
+    void (*__div0)(void);
+#endif
     void (*sleep)(int ticks);
     void (*yield)(void);
 
@@ -233,9 +236,6 @@ struct codec_api {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-#ifdef CPU_ARM
-    void (*__div0)(void);
-#endif
 };
 
 /* codec header */
diff --git a/apps/plugin.c b/apps/plugin.c
index f9f1c53617..856dd6e1cb 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -282,6 +282,7 @@ static const struct plugin_api rockbox_api = {
     reload_directory,
     create_numbered_filename,
     file_exists,
+    strip_extension,
 
     /* dir */
     opendir,
@@ -292,6 +293,9 @@ static const struct plugin_api rockbox_api = {
     dir_exists,
 
     /* kernel/ system */
+#ifdef CPU_ARM
+    __div0,
+#endif
     PREFIX(sleep),
     yield,
     &current_tick,
@@ -627,10 +631,6 @@ static const struct plugin_api rockbox_api = {
     appsversion,
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-#ifdef CPU_ARM
-    __div0,
-#endif
-    strip_extension
 };
 
 int plugin_load(const char* plugin, const void* parameter)
diff --git a/apps/plugin.h b/apps/plugin.h
index 715f2ec512..50598d5309 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -127,12 +127,12 @@ void* plugin_get_buffer(size_t *buffer_size);
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 142
+#define PLUGIN_API_VERSION 143
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
    new function which are "waiting" at the end of the function table) */
-#define PLUGIN_MIN_API_VERSION 142
+#define PLUGIN_MIN_API_VERSION 143
 
 /* plugin return codes */
 enum plugin_status {
@@ -389,6 +389,7 @@ struct plugin_api {
                                       const char *prefix, const char *suffix,
                                       int numberlen IF_CNFN_NUM_(, int *num));
     bool (*file_exists)(const char *file);
+    char* (*strip_extension)(char* buffer, int buffer_size, const char *filename);
 
 
     /* dir */
@@ -400,6 +401,9 @@ struct plugin_api {
     bool (*dir_exists)(const char *path);
 
     /* kernel/ system */
+#ifdef CPU_ARM
+    void (*__div0)(void);
+#endif
     void (*sleep)(int ticks);
     void (*yield)(void);
     volatile long* current_tick;
@@ -783,10 +787,6 @@ struct plugin_api {
         const char *appsversion;
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-#ifdef CPU_ARM
-    void (*__div0)(void);
-#endif
-    char* (*strip_extension)(char* buffer, int buffer_size, const char *filename);
 };
 
 /* plugin header */