diff --git a/apps/plugins/chessbox/gnuchess.c b/apps/plugins/chessbox/gnuchess.c
index b164e1f83f..51e200d0f2 100644
--- a/apps/plugins/chessbox/gnuchess.c
+++ b/apps/plugins/chessbox/gnuchess.c
@@ -64,7 +64,7 @@
 #define taxicab(a,b) (abs(column[a]-column[b]) + abs(row[a]-row[b]))
 
 /* ---- RockBox datatypes and variables */
-extern const struct plugin_api* rb;
+const struct plugin_api* rb;
 
 /* ---- Chess datatypes and variables ---- */
 struct leaf
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c
index eb5006494f..763e9d5681 100644
--- a/apps/plugins/doom/rockdoom.c
+++ b/apps/plugins/doom/rockdoom.c
@@ -101,7 +101,7 @@ int my_close(int id)
    return 0;
 }
 #endif
-extern const struct plugin_api* rb;
+const struct plugin_api* rb;
 #define MAXARGVS  100
 
 bool noprintf=0;  // Variable disables printf lcd updates to protect grayscale lib/direct lcd updates
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 596bbf6817..cb8c0d2133 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -268,7 +268,7 @@ PLUGIN_IRAM_DECLARE
 #endif
 #endif
 
-extern const struct plugin_api* rb;
+const struct plugin_api* rb;
 
 CACHE_FUNCTION_WRAPPERS(rb);
 ALIGN_BUFFER_WRAPPER(rb);
diff --git a/apps/plugins/pacbox/pacbox.c b/apps/plugins/pacbox/pacbox.c
index e5d3c225ce..c4ee037b5a 100644
--- a/apps/plugins/pacbox/pacbox.c
+++ b/apps/plugins/pacbox/pacbox.c
@@ -34,7 +34,7 @@
 PLUGIN_HEADER
 PLUGIN_IRAM_DECLARE
 
-extern const struct plugin_api* rb;
+const struct plugin_api* rb;
 
 struct pacman_settings {
     int difficulty;
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 57dbd21590..1addef2e44 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -32,7 +32,7 @@ PLUGIN_IRAM_DECLARE
 /* here is a global api struct pointer. while not strictly necessary,
    it's nice not to have to pass the api pointer in all function calls
    in the plugin */
-bool plugbuf;
+const struct plugin_api* rb;
 int shut,cleanshut;
 char *errormsg;
 
diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h
index b60f1e9763..179de2313f 100644
--- a/apps/plugins/rockboy/rockmacros.h
+++ b/apps/plugins/rockboy/rockmacros.h
@@ -109,7 +109,7 @@ struct options {
    int dirty;
 };
 
-extern bool plugbuf;
+bool plugbuf;
 
 extern struct options options;
 #define savedir ROCKBOX_DIR "/rockboy"
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c
index 9a6def229c..3910e14011 100644
--- a/apps/plugins/sudoku/sudoku.c
+++ b/apps/plugins/sudoku/sudoku.c
@@ -82,7 +82,7 @@ PLUGIN_HEADER
    it's nice not to have to pass the api pointer in all function calls
    in the plugin */
 
-extern const struct plugin_api* rb;
+const struct plugin_api* rb;
 
 /* Default game - used to initialise sudoku.ss if it doesn't exist. */
 static const char default_game[9][9] =
diff --git a/apps/plugins/zxbox/zxbox.c b/apps/plugins/zxbox/zxbox.c
index 3d268dbb1f..fbb61c1352 100644
--- a/apps/plugins/zxbox/zxbox.c
+++ b/apps/plugins/zxbox/zxbox.c
@@ -24,7 +24,7 @@
 PLUGIN_HEADER
 PLUGIN_IRAM_DECLARE
 
-extern const struct plugin_api* rb;
+const struct plugin_api* rb;
 
 #include "spkey_p.h"