diff --git a/apps/plugin.c b/apps/plugin.c
index 6ef8623eea..4ba1396085 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -609,10 +609,12 @@ static const struct plugin_api rockbox_api = {
 
     thread_thaw,
 
-#if (CONFIG_CODEC == SWCODEC)
+#ifdef HAVE_SEMAPHORE_OBJECTS
     semaphore_init,
     semaphore_wait,
     semaphore_release,
+#endif
+#ifdef HAVE_EVENT_OBJECTS
     event_init,
     event_wait,
     event_set_state,
diff --git a/apps/plugin.h b/apps/plugin.h
index 409108d2d9..20724f8706 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -764,11 +764,13 @@ struct plugin_api {
 #endif
 
     void (*thread_thaw)(struct thread_entry *thread);
-
-#if (CONFIG_CODEC == SWCODEC) 
+ 
+#ifdef HAVE_SEMAPHORE_OBJECTS
     void (*semaphore_init)(struct semaphore *s, int max, int start);
     void (*semaphore_wait)(struct semaphore *s);
     void (*semaphore_release)(struct semaphore *s);
+#endif
+#ifdef HAVE_EVENT_OBJECTS
     void (*event_init)(struct event *e, unsigned int flags);
     void (*event_wait)(struct event *e, unsigned int for_state);
     void (*event_set_state)(struct event *e, unsigned int state);