11 files changed, 14 insertions, 22 deletions
diff --git a/02-usart/include/apb.h b/02-usart/include/core/apb.h
index 11fa7ab..11fa7ab 100644
--- a/02-usart/include/apb.h
+++ b/02-usart/include/core/apb.h
diff --git a/02-usart/include/clock.h b/02-usart/include/core/clock.h
index 46ac6f2..c3c58d7 100644
--- a/02-usart/include/clock.h
+++ b/02-usart/include/core/clock.h
@@ -1,5 +1,5 @@
-#ifndef CLOCK_H__
-#define CLOCK_H__
+#ifndef CORE_CLOCK_H__
+#define CORE_CLOCK_H__
 
 #include <stdint.h>
 #include "rcc.h"
@@ -123,4 +123,4 @@ int configure_pll(
     pllm_divisor_t pllm, /* PLL denominator. */
     pll_src_t pllsrc /* PLL source */);
 
-#endif /* CLOCK_H__ */
+#endif /* CORE_CLOCK_H__ */
diff --git a/02-usart/include/dma.h b/02-usart/include/core/dma.h
index 229b732..1ae41a0 100644
--- a/02-usart/include/dma.h
+++ b/02-usart/include/core/dma.h
@@ -1,5 +1,5 @@
-#ifndef DMA_H_
-#define DMA_H_
+#ifndef CORE_DMA_H_
+#define CORE_DMA_H_
 
 /*
  * Header file for definining the DMA (Direct Memory Access).
@@ -169,4 +169,4 @@ typedef struct {
 
 static_assert(offsetof(dma_t, csel_r) == 0xA8, "Offset check failed.");
 
-#endif /* DMA_H_ */
+#endif /* CORE_DMA_H_ */
diff --git a/02-usart/include/flash.h b/02-usart/include/core/flash.h
index a163a25..a163a25 100644
--- a/02-usart/include/flash.h
+++ b/02-usart/include/core/flash.h
diff --git a/02-usart/include/gpio.h b/02-usart/include/core/gpio.h
index 62169c6..856a176 100644
--- a/02-usart/include/gpio.h
+++ b/02-usart/include/core/gpio.h
@@ -1,5 +1,5 @@
-#ifndef GPIO_H__
-#define GPIO_H__
+#ifndef CORE_GPIO_H__
+#define CORE_GPIO_H__
 
 #include "common.h"
 #include "rcc.h"
@@ -143,4 +143,4 @@ __IO gpio_port_t* enable_gpio(gpio_port_number_t number);
 void set_gpio_alternate_function(
     __IO gpio_port_t* port, gpio_pin_t gpio_pin, alternate_function_t afn);
 
-#endif /* GPIO_H__ */
+#endif /* CORE_GPIO_H__ */
diff --git a/02-usart/include/isr_vector.h b/02-usart/include/core/isr_vector.h
index 7cb4596..78763cd 100644
--- a/02-usart/include/isr_vector.h
+++ b/02-usart/include/core/isr_vector.h
@@ -1,5 +1,5 @@
-#ifndef h__ISR_VECTOR_H__
-#define h__ISR_VECTOR_H__
+#ifndef CORE_h__ISR_VECTOR_H__
+#define CORE_h__ISR_VECTOR_H__
 
 #include <stdint.h>
 
@@ -21,4 +21,4 @@ void unhandled_isr(uint8_t val);
 
 void isr_simple_pin_on();
 
-#endif /* h___ISR_VECTOR_H__ */
+#endif /* CORE_h___ISR_VECTOR_H__ */
diff --git a/02-usart/include/isrs.i b/02-usart/include/core/isrs.i
index cdb3889..cdb3889 100644
--- a/02-usart/include/isrs.i
+++ b/02-usart/include/core/isrs.i
diff --git a/02-usart/include/rcc.h b/02-usart/include/core/rcc.h
index 05f5e5f..05f5e5f 100644
--- a/02-usart/include/rcc.h
+++ b/02-usart/include/core/rcc.h
diff --git a/02-usart/include/system.h b/02-usart/include/core/system.h
index f2a4de9..c836edc 100644
--- a/02-usart/include/system.h
+++ b/02-usart/include/core/system.h
@@ -1,5 +1,5 @@
-#ifndef SYSTEM_H_
-#define SYSTEM_H_
+#ifndef CORE_SYSTEM_H_
+#define CORE_SYSTEM_H_
 
 #include <stdint.h>
 #include "common.h"
diff --git a/02-usart/include/usart.h b/02-usart/include/core/usart.h
index 9ed6dbb..9ed6dbb 100644
--- a/02-usart/include/usart.h
+++ b/02-usart/include/core/usart.h
diff --git a/02-usart/include/mem.h b/02-usart/include/mem.h
index fefe53d..aa4ce12 100644
--- a/02-usart/include/mem.h
+++ b/02-usart/include/mem.h
@@ -1,12 +1,4 @@
 #ifndef MEM_H_
 #define MEM_H_
 
-#include "common.h"
-
-void memcpy_(void* dest, const void* src, size_t len);
-
-#ifdef ARCH_STM32L4
-#define memcpy memcpy_
-#endif
-
 #endif