diff --git a/lib/flash.c b/lib/flash.c
index c5e84699..88f535d5 100644
--- a/lib/flash.c
+++ b/lib/flash.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32.h>
+#include <libopenstm32/flash.h>
 
 void flash_prefetch_buffer_enable(void)
 {
diff --git a/lib/gpio.c b/lib/gpio.c
index be38aa36..6d1d21e4 100644
--- a/lib/gpio.c
+++ b/lib/gpio.c
@@ -34,7 +34,7 @@
  *  - GPIO remapping support
  */
 
-#include <libopenstm32.h>
+#include <libopenstm32/gpio.h>
 
 void gpio_set_mode(u32 gpioport, u8 mode, u8 cnf, u16 gpios)
 {
diff --git a/lib/i2c.c b/lib/i2c.c
index 7dbc889d..e161b7f3 100644
--- a/lib/i2c.c
+++ b/lib/i2c.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32.h>
+#include <libopenstm32/i2c.h>
 
 void i2c_peripheral_enable(u32 i2c)
 {
diff --git a/lib/rcc.c b/lib/rcc.c
index 92d68154..6f3d2bad 100644
--- a/lib/rcc.c
+++ b/lib/rcc.c
@@ -20,7 +20,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32.h>
+#include <libopenstm32/rcc.h>
+#include <libopenstm32/flash.h>
 
 void rcc_osc_ready_int_clear(osc_t osc)
 {
@@ -324,7 +325,6 @@ u32 rcc_system_clock_source(void)
 	return ((RCC_CFGR & 0x000c) >> 2);
 }
 
-
 /*
  * These functions are setting up the whole clock system for the most common
  * input clock and output clock configurations.
diff --git a/lib/rtc.c b/lib/rtc.c
index 9cad5279..42abcb3a 100644
--- a/lib/rtc.c
+++ b/lib/rtc.c
@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32.h>
+#include <libopenstm32/rcc.h>
+#include <libopenstm32/rtc.h>
 
 void rtc_init(void)
 {
diff --git a/lib/spi.c b/lib/spi.c
index e65bbc9e..0e93ec33 100644
--- a/lib/spi.c
+++ b/lib/spi.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32.h>
+#include <libopenstm32/spi.h>
 
 /*
  * SPI and I2S code.
diff --git a/lib/usart.c b/lib/usart.c
index abed18b2..d2168d6e 100644
--- a/lib/usart.c
+++ b/lib/usart.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32.h>
+#include <libopenstm32/usart.h>
 
 void usart_set_baudrate(u32 usart, u32 baud)
 {
diff --git a/lib/vector.c b/lib/vector.c
index 055fa791..1a8043dc 100644
--- a/lib/vector.c
+++ b/lib/vector.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32.h>
-
 #define WEAK __attribute__ ((weak))
 
 void main(void);
@@ -96,7 +94,7 @@ void WEAK dma2_channel3_isr(void);
 void WEAK dma2_channel4_5_isr(void);
 
 __attribute__ ((section(".vectors")))
-    void (*const vector_table[]) (void) = {
+void (*const vector_table[]) (void) = {
 	(void *)0x20000800,	/* Use 2KB stack (0x800 bytes). */
 	main,			/* Use main() as reset vector for now. */
 	nmi_handler,
@@ -181,6 +179,7 @@ void blocking_handler(void)
 
 void null_handler(void)
 {
+	/* Do nothing. */
 }
 
 #pragma weak nmi_handler = null_handler