diff --git a/Makefile b/Makefile
index f4590d4..e36bc78 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,6 @@ CFLAGS += -fno-common --function-sections -fdata-sections
 
 obj-y += source/main.o
 obj-y += source/shell.o
-obj-y += source/usart.o
 
 obj-y += source/core/flash.o
 
diff --git a/include/usart.h b/include/console.h
similarity index 100%
rename from include/usart.h
rename to include/console.h
diff --git a/scripts/Makefile.stm32f0 b/scripts/Makefile.stm32f0
index a8aa42e..dbbc6ed 100644
--- a/scripts/Makefile.stm32f0
+++ b/scripts/Makefile.stm32f0
@@ -19,6 +19,7 @@ STLINK_PORT ?= :4242
 obj-y += source/core/spi.o
 obj-y += source/drivers/spi_flash.o
 obj-y += source/drivers/stm32f0_spi.o
+obj-y += source/drivers/usart_console.o
 
 $(OPENCM3_DIR)/lib/lib$(OPENCM3_LIBNAME).a:
 	@if [ ! -e libopencm3/.git ]; then \
diff --git a/source/usart.c b/source/drivers/usart_console.c
similarity index 98%
rename from source/usart.c
rename to source/drivers/usart_console.c
index a8b0791..331a5de 100644
--- a/source/usart.c
+++ b/source/drivers/usart_console.c
@@ -12,7 +12,7 @@
 #include <limits.h>
 #include <sys/types.h>
 
-#include "usart.h"
+#include <console.h>
 
 static ssize_t usart_read(void *cookie, char *buf, size_t n)
 {
diff --git a/source/main.c b/source/main.c
index 1271f91..d73c614 100644
--- a/source/main.c
+++ b/source/main.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
-#include "shell.h"
-#include "usart.h"
+#include <console.h>
+#include <shell.h>
 
 int main(void)
 {