diff --git a/app/stringtests/string_tests.c b/app/stringtests/string_tests.c
index ac558b3..fcb1e1b 100644
--- a/app/stringtests/string_tests.c
+++ b/app/stringtests/string_tests.c
@@ -191,8 +191,8 @@
 	}
 }
 
-#if defined(WITH_APP_CONSOLE)
-#include <app/console.h>
+#if defined(WITH_LIB_CONSOLE)
+#include <lib/console.h>
 
 static int string_tests(int argc, cmd_args *argv)
 {
diff --git a/app/tests/tests.c b/app/tests/tests.c
index cba3071..0fc2bcb 100644
--- a/app/tests/tests.c
+++ b/app/tests/tests.c
@@ -23,8 +23,8 @@
 #include <app/tests.h>
 #include <compiler.h>
 
-#if defined(WITH_APP_CONSOLE)
-#include <app/console.h>
+#if defined(WITH_LIB_CONSOLE)
+#include <lib/console.h>
 
 STATIC_COMMAND_START
 		{ "printf_tests", NULL, (console_cmd)&printf_tests },
diff --git a/kernel/debug.c b/kernel/debug.c
index 63af6d5..c3d7220 100644
--- a/kernel/debug.c
+++ b/kernel/debug.c
@@ -26,8 +26,8 @@
 #include <kernel/timer.h>
 #include <platform.h>
 
-#if defined(WITH_APP_CONSOLE)
-#include <app/console.h>
+#if defined(WITH_LIB_CONSOLE)
+#include <lib/console.h>
 
 static int cmd_threads(int argc, const cmd_args *argv);
 static int cmd_threadstats(int argc, const cmd_args *argv);
diff --git a/lib/debug/debug.c b/lib/debug/debug.c
index b12a829..ff4e135 100644
--- a/lib/debug/debug.c
+++ b/lib/debug/debug.c
@@ -132,8 +132,8 @@
 	}	
 }
 
-#ifdef WITH_APP_CONSOLE
-#include <app/console.h>
+#ifdef WITH_LIB_CONSOLE
+#include <lib/console.h>
 
 static int cmd_display_mem(int argc, const cmd_args *argv);
 static int cmd_modify_mem(int argc, const cmd_args *argv);
diff --git a/lib/heap/heap.c b/lib/heap/heap.c
index 2ed35c4..c67bc25 100644
--- a/lib/heap/heap.c
+++ b/lib/heap/heap.c
@@ -348,9 +348,9 @@
 }
 
 #if DEBUGLEVEL > 1
-#if WITH_APP_CONSOLE
+#if WITH_LIB_CONSOLE
 
-#include <app/console.h>
+#include <lib/console.h>
 
 static int cmd_heap(int argc, const cmd_args *argv);
 
diff --git a/platform/omap3/i2c.c b/platform/omap3/i2c.c
index ad07d29..8736c02 100644
--- a/platform/omap3/i2c.c
+++ b/platform/omap3/i2c.c
@@ -266,9 +266,9 @@
 {
 }
 
-#if WITH_APP_CONSOLE
+#if WITH_LIB_CONSOLE
 
-#include <app/console.h>
+#include <lib/console.h>
 
 static int cmd_i2c(int argc, const cmd_args *argv);
 
diff --git a/project/armemu-test/init.c b/project/armemu-test/init.c
index 7586c24..34c32b6 100644
--- a/project/armemu-test/init.c
+++ b/project/armemu-test/init.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <app/tests.h>
-#include <app/console.h>
+#include <lib/console.h>
 
 void project_init(void)
 {
diff --git a/project/armemu-test/rules.mk b/project/armemu-test/rules.mk
index eccbefb..7808e5a 100644
--- a/project/armemu-test/rules.mk
+++ b/project/armemu-test/rules.mk
@@ -5,7 +5,7 @@
 TARGET := armemu
 MODULES += \
 	app/tests \
-	app/console
+	lib/console
 
 OBJS += \
 	$(LOCAL_DIR)/init.o
diff --git a/project/beagle-test/init.c b/project/beagle-test/init.c
index 725ec5c..313b398 100644
--- a/project/beagle-test/init.c
+++ b/project/beagle-test/init.c
@@ -22,7 +22,7 @@
  */
 #include <debug.h>
 #include <arch/arm.h>
-#include <app/console.h>
+#include <lib/console.h>
 #include <app/tests.h>
 #include <dev/usb.h>
 
diff --git a/project/beagle-test/rules.mk b/project/beagle-test/rules.mk
index 336afe2..01e6376 100644
--- a/project/beagle-test/rules.mk
+++ b/project/beagle-test/rules.mk
@@ -6,8 +6,8 @@
 
 MODULES += \
 	app/tests \
-	app/console \
-	app/stringtests
+	app/stringtests \
+	lib/console
 
 OBJS += \
 	$(LOCAL_DIR)/init.o
diff --git a/project/osk5912-test/init.c b/project/osk5912-test/init.c
index 569427f..a3742c0 100644
--- a/project/osk5912-test/init.c
+++ b/project/osk5912-test/init.c
@@ -22,7 +22,7 @@
  */
 #include <debug.h>
 #include <arch/arm.h>
-#include <app/console.h>
+#include <lib/console.h>
 #include <app/tests.h>
 
 extern int string_tests(void);
diff --git a/project/osk5912-test/rules.mk b/project/osk5912-test/rules.mk
index 353ddf2..4f77c2a 100644
--- a/project/osk5912-test/rules.mk
+++ b/project/osk5912-test/rules.mk
@@ -5,7 +5,7 @@
 TARGET := osk5912
 MODULES += \
 	app/tests \
-	app/console
+	lib/console
 
 OBJS += \
 	$(LOCAL_DIR)/init.o
diff --git a/project/surf-test/init.c b/project/surf-test/init.c
index 87be66d..5ef05b7 100644
--- a/project/surf-test/init.c
+++ b/project/surf-test/init.c
@@ -31,7 +31,7 @@
 
 #include <debug.h>
 #include <arch/arm.h>
-#include <app/console.h>
+#include <lib/console.h>
 #include <app/tests.h>
 
 extern int string_tests(void);
diff --git a/project/surf-test/rules.mk b/project/surf-test/rules.mk
index 59b2f9b..a2a9171 100644
--- a/project/surf-test/rules.mk
+++ b/project/surf-test/rules.mk
@@ -10,7 +10,7 @@
 
 MODULES += \
 	app/tests \
-	app/console
+	lib/console
 
 OBJS += \
 	$(LOCAL_DIR)/init.o