diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile
index 259a61aa2d..83b0a54213 100644
--- a/sys/shell/commands/Makefile
+++ b/sys/shell/commands/Makefile
@@ -1,4 +1,4 @@
-SRC = shell_commands.c sc_id.c sc_heap.c
+SRC = shell_commands.c sc_id.c
 INCLUDES = -I../../../core/include -I../../include -I../../../drivers/include/
 
 ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
@@ -32,6 +32,9 @@ endif
 ifneq (,$(findstring sht11,$(USEMODULE)))
 	SRC += sc_sht11.c
 endif
+ifneq (,$(findstring lpc_common,$(USEMODULE)))
+	SRC += sc_heap.c
+endif
 
 OBJ = $(SRC:%.c=$(BINDIR)%.o)
 DEP = $(SRC:%.c=$(BINDIR)%.d)
diff --git a/sys/shell/commands/sc_heap.c b/sys/shell/commands/sc_heap.c
index a7f4fa8531..7cc9f7a9c3 100644
--- a/sys/shell/commands/sc_heap.c
+++ b/sys/shell/commands/sc_heap.c
@@ -18,8 +18,6 @@
  * @note    $Id: sc_heap.c 3855 2013-09-05 12:40:11 kasmi $
  */
 
-#ifdef MODULE_LPC_COMMON
-
 extern void heap_stats(void);
 
 void _heap_handler(char *unused)
@@ -28,5 +26,3 @@ void _heap_handler(char *unused)
     heap_stats();
 }
 
-#endif
-