diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index 2ba73af627..8bfa53c1cf 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -16,6 +16,7 @@ CODECS := $(subst $(ROOTDIR),$(BUILDDIR),$(CODECS))
 
 # the codec helper library
 include $(APPSDIR)/codecs/lib/libcodec.make
+OTHER_INC += -I$(APPSDIR)/codecs/lib
 
 # the codec libraries
 include $(APPSDIR)/codecs/demac/libdemac.make
diff --git a/apps/codecs/lib/misc.h b/apps/codecs/lib/codeclib_misc.h
similarity index 100%
rename from apps/codecs/lib/misc.h
rename to apps/codecs/lib/codeclib_misc.h
diff --git a/apps/codecs/lib/mdct2.h b/apps/codecs/lib/mdct2.h
index b03430b21a..ba0f12972e 100644
--- a/apps/codecs/lib/mdct2.h
+++ b/apps/codecs/lib/mdct2.h
@@ -31,7 +31,7 @@
 #include <codecs.h>
 #include "asm_arm.h"
 #include "asm_mcf5249.h"
-#include "misc.h"
+#include "codeclib_misc.h"
 
 #ifndef ICONST_ATTR_TREMOR_WINDOW
 #define ICONST_ATTR_TREMOR_WINDOW ICONST_ATTR
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES
index b55fea0620..bb7da12e8b 100644
--- a/apps/plugins/lib/SOURCES
+++ b/apps/plugins/lib/SOURCES
@@ -9,7 +9,7 @@ rgb_hsv.c
    pluginlib for use with greylib overlay output
 */
 #if LCD_DEPTH == 1
-resize.c
+pluginlib_resize.c
 #endif
 grey_core.c
 grey_draw.c
@@ -37,7 +37,7 @@ picture.c
 xlcd_core.c
 xlcd_draw.c
 xlcd_scroll.c
-bmp.c
+pluginlib_bmp.c
 #ifdef HAVE_LCD_COLOR
 bmp_smooth_scale.c
 #endif
diff --git a/apps/plugins/lib/bmp_smooth_scale.c b/apps/plugins/lib/bmp_smooth_scale.c
index 860a20e7df..4d5eab00a0 100644
--- a/apps/plugins/lib/bmp_smooth_scale.c
+++ b/apps/plugins/lib/bmp_smooth_scale.c
@@ -70,7 +70,7 @@
  * (C) Daniel M. Duley.
  */
 
-#include "bmp.h"
+#include "pluginlib_bmp.h"
 #include "lcd.h"
 
 void smooth_resize_bitmap(struct bitmap *src_bmp,  struct bitmap *dest_bmp)
diff --git a/apps/plugins/lib/bmp.c b/apps/plugins/lib/pluginlib_bmp.c
similarity index 99%
rename from apps/plugins/lib/bmp.c
rename to apps/plugins/lib/pluginlib_bmp.c
index 1cb24d3ea0..b1dd53b15e 100644
--- a/apps/plugins/lib/bmp.c
+++ b/apps/plugins/lib/pluginlib_bmp.c
@@ -20,7 +20,7 @@
  *
  ****************************************************************************/
 
-#include "bmp.h"
+#include "pluginlib_bmp.h"
 
 #include "lcd.h"
 #include "file.h"
diff --git a/apps/plugins/lib/bmp.h b/apps/plugins/lib/pluginlib_bmp.h
similarity index 100%
rename from apps/plugins/lib/bmp.h
rename to apps/plugins/lib/pluginlib_bmp.h
diff --git a/apps/plugins/lib/resize.c b/apps/plugins/lib/pluginlib_resize.c
similarity index 100%
rename from apps/plugins/lib/resize.c
rename to apps/plugins/lib/pluginlib_resize.c
diff --git a/apps/plugins/lib/resize.h b/apps/plugins/lib/pluginlib_resize.h
similarity index 100%
rename from apps/plugins/lib/resize.h
rename to apps/plugins/lib/pluginlib_resize.h
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 0921c0bce2..c6c399db48 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -32,7 +32,7 @@ $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make))
 PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds
 PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link
 
-OTHER_INC += -I$(APPSDIR)/plugins
+OTHER_INC += -I$(APPSDIR)/plugins -I$(APPSDIR)/plugins/lib
 
 # special compile flags for plugins:
 PLUGINFLAGS = -I$(APPSDIR)/plugins -DPLUGIN $(CFLAGS) 
diff --git a/apps/plugins/ppmviewer.c b/apps/plugins/ppmviewer.c
index 97f085ad6f..6db24ff804 100644
--- a/apps/plugins/ppmviewer.c
+++ b/apps/plugins/ppmviewer.c
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "plugin.h"
-#include "lib/bmp.h"
+#include "lib/pluginlib_bmp.h"
 
 #if defined(HAVE_LCD_COLOR)
 
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index b66324c85b..96ae7c5af5 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -29,7 +29,7 @@
  */
 
 #include "plugin.h"
-#include "lib/bmp.h"
+#include "lib/pluginlib_bmp.h"
 #include "lib/rgb_hsv.h"
 
 PLUGIN_HEADER
diff --git a/apps/plugins/test_greylib_bitmap_scale.c b/apps/plugins/test_greylib_bitmap_scale.c
index a3de006e05..1e45130318 100644
--- a/apps/plugins/test_greylib_bitmap_scale.c
+++ b/apps/plugins/test_greylib_bitmap_scale.c
@@ -21,8 +21,8 @@
 
 #include "plugin.h"
 #include "lib/grey.h"
-#include "lib/resize.h"
-#include "lib/bmp.h"
+#include "lib/pluginlib_resize.h"
+#include "lib/pluginlib_bmp.h"
 
 #if LCD_DEPTH == 1
 #define BMP_LOAD read_bmp_file
diff --git a/apps/plugins/test_resize.c b/apps/plugins/test_resize.c
index a608005c10..e98fa80ba5 100644
--- a/apps/plugins/test_resize.c
+++ b/apps/plugins/test_resize.c
@@ -26,7 +26,7 @@
 
 #include "plugin.h"
 #include "lib/pluginlib_actions.h"
-#include "lib/bmp.h"
+#include "lib/pluginlib_bmp.h"
 
 PLUGIN_HEADER