diff --git a/apps/plugins/euroconverter.c b/apps/plugins/euroconverter.c
index 24cebe69d1..08dc377368 100644
--- a/apps/plugins/euroconverter.c
+++ b/apps/plugins/euroconverter.c
@@ -20,6 +20,7 @@
  ****************************************************************************/
 #include "plugin.h"
 #include "lib/configfile.h"
+#include "lib/pluginlib_exit.h"
 
 #ifdef HAVE_LCD_CHARCELLS
 
diff --git a/apps/plugins/goban.c b/apps/plugins/goban.c
index 1a121202c6..5ad7b37327 100644
--- a/apps/plugins/goban.c
+++ b/apps/plugins/goban.c
@@ -20,14 +20,9 @@
  ****************************************************************************/
 #include "plugin.h"
 
-#if PLUGIN_BUFFER_SIZE < 0x10000 && (CONFIG_PLATFORM & PLATFORM_NATIVE)
-
 #include "lib/overlay.h"
 
-
-
 enum plugin_status plugin_start(const void* parameter)
 {
     return run_overlay(parameter, PLUGIN_GAMES_DIR "/goban.ovl", "Goban");
 }
-#endif
diff --git a/apps/plugins/nim.c b/apps/plugins/nim.c
index 3301277410..07e41ffe3e 100644
--- a/apps/plugins/nim.c
+++ b/apps/plugins/nim.c
@@ -19,6 +19,7 @@
  *
  ****************************************************************************/
 #include "plugin.h"
+#include "lib/pluginlib_exit.h"
 
 #ifdef HAVE_LCD_CHARCELLS
 
@@ -122,10 +123,8 @@ static void display_first_line(int x)
 }
 
 /* Call when the program end */
-static void nim_exit(void *parameter)
+static void nim_exit(void)
 {
-    (void)parameter;
-    
     /*Restore the old pattern*/
     rb->lcd_unlock_pattern(h1);
     rb->lcd_unlock_pattern(h2);