From 5cd4871a9489d74e233b90b0b4b4aa18a8cf6fd4 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 18 Jan 2018 14:23:36 +0900
Subject: [PATCH] Fix mcu/stm32f103.h.

---
 ChangeLog               |  4 ++++
 NEWS                    | 10 ++++++++++
 contrib/adc-stm32f103.c |  3 +--
 mcu/chx-stm32f103.c     |  1 -
 mcu/stm32f103.h         |  3 +++
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f3d2548..cd0fa9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-18  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* mcu/stm32f103.h: Include stm32.h and cortex-m.h.
+
 2018-01-09  Anthony Romano <romanoanthony061@gmail.com>
 
 	* contrib/adc-stm32f103.c: Support IN8 config.
diff --git a/NEWS b/NEWS
index a8ac9c0..3d5ef79 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,16 @@
 NEWS - Noteworthy changes
 
 
+* Major changes in Chopstx 1.8
+
+  Released 2018-01-XX
+
+** Minor API fix
+In version 1.6, part of mcu/stm32f103.h was moved into mcu/cortex-m.h
+and mcu/stm32.h.  Now, mcu/stm32f103.h automatically includes
+mcu/cortex-m.h and mcu/stm32.h.
+
+
 * Major changes in Chopstx 1.7
 
   Released 2017-12-19
diff --git a/contrib/adc-stm32f103.c b/contrib/adc-stm32f103.c
index 6ea2c58..20e058f 100644
--- a/contrib/adc-stm32f103.c
+++ b/contrib/adc-stm32f103.c
@@ -3,7 +3,7 @@
  *                   In this ADC driver, there are NeuG specific parts.
  *                   You need to modify to use this as generic ADC driver.
  *
- * Copyright (C) 2011, 2012, 2013, 2015, 2016
+ * Copyright (C) 2011, 2012, 2013, 2015, 2016, 2017, 2018
  *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
@@ -32,7 +32,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <chopstx.h>
-#include <mcu/stm32.h>
 #include <mcu/stm32f103.h>
 #include "adc.h"
 
diff --git a/mcu/chx-stm32f103.c b/mcu/chx-stm32f103.c
index 5b81197..51d327e 100644
--- a/mcu/chx-stm32f103.c
+++ b/mcu/chx-stm32f103.c
@@ -1,5 +1,4 @@
 #include <stdint.h>
-#include <mcu/stm32.h>
 #include <mcu/stm32f103.h>
 #include "board.h"
 
diff --git a/mcu/stm32f103.h b/mcu/stm32f103.h
index 1ab8efe..140cc3e 100644
--- a/mcu/stm32f103.h
+++ b/mcu/stm32f103.h
@@ -1,3 +1,6 @@
+#include <mcu/stm32.h>
+#include <mcu/cortex-m.h>
+
 #define  CRC_CR_RESET                        0x00000001
 
 struct CRC {