Merge pull request #2878 from geky/restructure

Restructure directory layout

MANIFEST.in

@@ -1,3 +0,0 @@
-graft tools
-recursive-exclude tools *.pyc
-include LICENSE

drivers/AnalogIn.cpp

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#include "mbed.h"
-
-#include "AnalogIn.h"
+#include "drivers/AnalogIn.h"
 
 #if DEVICE_ANALOGIN
 

drivers/AnalogIn.h

@@ -16,13 +16,13 @@
 #ifndef MBED_ANALOGIN_H
 #define MBED_ANALOGIN_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_ANALOGIN
 
-#include "analogin_api.h"
-#include "SingletonPtr.h"
-#include "PlatformMutex.h"
+#include "hal/analogin_api.h"
+#include "platform/SingletonPtr.h"
+#include "platform/PlatformMutex.h"
 
 namespace mbed {
 

drivers/AnalogOut.h

@@ -16,12 +16,12 @@
 #ifndef MBED_ANALOGOUT_H
 #define MBED_ANALOGOUT_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_ANALOGOUT
 
-#include "analogout_api.h"
-#include "PlatformMutex.h"
+#include "hal/analogout_api.h"
+#include "platform/PlatformMutex.h"
 
 namespace mbed {
 

drivers/BusIn.cpp

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "BusIn.h"
-#include "mbed_assert.h"
+#include "drivers/BusIn.h"
+#include "platform/mbed_assert.h"
 
 namespace mbed {
 

drivers/BusIn.h

@@ -16,9 +16,9 @@
 #ifndef MBED_BUSIN_H
 #define MBED_BUSIN_H
 
-#include "platform.h"
-#include "DigitalIn.h"
-#include "PlatformMutex.h"
+#include "platform/platform.h"
+#include "drivers/DigitalIn.h"
+#include "platform/PlatformMutex.h"
 
 namespace mbed {
 

drivers/BusInOut.cpp

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "BusInOut.h"
-#include "mbed_assert.h"
+#include "drivers/BusInOut.h"
+#include "platform/mbed_assert.h"
 
 namespace mbed {
 

drivers/BusInOut.h

@@ -16,8 +16,8 @@
 #ifndef MBED_BUSINOUT_H
 #define MBED_BUSINOUT_H
 
-#include "DigitalInOut.h"
-#include "PlatformMutex.h"
+#include "drivers/DigitalInOut.h"
+#include "platform/PlatformMutex.h"
 
 namespace mbed {
 

drivers/BusOut.cpp

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "BusOut.h"
-#include "mbed_assert.h"
+#include "drivers/BusOut.h"
+#include "platform/mbed_assert.h"
 
 namespace mbed {
 

drivers/BusOut.h

@@ -16,8 +16,8 @@
 #ifndef MBED_BUSOUT_H
 #define MBED_BUSOUT_H
 
-#include "DigitalOut.h"
-#include "PlatformMutex.h"
+#include "drivers/DigitalOut.h"
+#include "platform/PlatformMutex.h"
 
 namespace mbed {
 

drivers/CAN.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "CAN.h"
+#include "drivers/CAN.h"
 
 #if DEVICE_CAN
 

drivers/CAN.h

@@ -16,14 +16,13 @@
 #ifndef MBED_CAN_H
 #define MBED_CAN_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_CAN
 
-#include "can_api.h"
-#include "can_helper.h"
-#include "Callback.h"
-#include "PlatformMutex.h"
+#include "hal/can_api.h"
+#include "platform/Callback.h"
+#include "platform/PlatformMutex.h"
 
 namespace mbed {
 

drivers/DigitalIn.h

@@ -16,10 +16,10 @@
 #ifndef MBED_DIGITALIN_H
 #define MBED_DIGITALIN_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
-#include "gpio_api.h"
-#include "critical.h"
+#include "hal/gpio_api.h"
+#include "platform/critical.h"
 
 namespace mbed {
 

drivers/DigitalInOut.h

@@ -16,10 +16,10 @@
 #ifndef MBED_DIGITALINOUT_H
 #define MBED_DIGITALINOUT_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
-#include "gpio_api.h"
-#include "critical.h"
+#include "hal/gpio_api.h"
+#include "platform/critical.h"
 
 namespace mbed {
 

drivers/DigitalOut.h

@@ -16,9 +16,9 @@
 #ifndef MBED_DIGITALOUT_H
 #define MBED_DIGITALOUT_H
 
-#include "platform.h"
-#include "gpio_api.h"
-#include "critical.h"
+#include "platform/platform.h"
+#include "hal/gpio_api.h"
+#include "platform/critical.h"
 
 namespace mbed {
 

drivers/Ethernet.cpp

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Ethernet.h"
+#include "drivers/Ethernet.h"
 
 #if DEVICE_ETHERNET
 
-#include "ethernet_api.h"
+#include "hal/ethernet_api.h"
 
 namespace mbed {
 

drivers/Ethernet.h

@@ -16,7 +16,7 @@
 #ifndef MBED_ETHERNET_H
 #define MBED_ETHERNET_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_ETHERNET
 

drivers/FileBase.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "FileBase.h"
+#include "drivers/FileBase.h"
 
 namespace mbed {
 

drivers/FileBase.h

@@ -18,7 +18,8 @@
 
 typedef int FILEHANDLE;
 
-#include <stdio.h>
+#include <cstdio>
+#include <cstring>
 
 #if defined(__ARMCC_VERSION) || defined(__ICCARM__)
 #    define O_RDONLY 0
@@ -40,9 +41,9 @@ typedef long off_t;
 #    include <sys/syslimits.h>
 #endif
 
-#include "platform.h"
-#include "SingletonPtr.h"
-#include "PlatformMutex.h"
+#include "platform/platform.h"
+#include "platform/SingletonPtr.h"
+#include "platform/PlatformMutex.h"
 
 namespace mbed {
 

drivers/FileLike.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "FileLike.h"
+#include "drivers/FileLike.h"
 
 namespace mbed {
 

drivers/FileLike.h

@@ -16,8 +16,8 @@
 #ifndef MBED_FILELIKE_H
 #define MBED_FILELIKE_H
 
-#include "FileBase.h"
-#include "FileHandle.h"
+#include "drivers/FileBase.h"
+#include "drivers/FileHandle.h"
 
 namespace mbed {
 

drivers/FilePath.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "FilePath.h"
+#include "drivers/FilePath.h"
 
 namespace mbed {
 

drivers/FilePath.h

@@ -16,10 +16,10 @@
 #ifndef MBED_FILEPATH_H
 #define MBED_FILEPATH_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
-#include "FileSystemLike.h"
-#include "FileLike.h"
+#include "drivers/FileSystemLike.h"
+#include "drivers/FileLike.h"
 
 namespace mbed {
 

drivers/FileSystemLike.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "FileSystemLike.h"
+#include "drivers/FileSystemLike.h"
 
 namespace mbed {
 

drivers/FileSystemLike.h

@@ -16,11 +16,11 @@
 #ifndef MBED_FILESYSTEMLIKE_H
 #define MBED_FILESYSTEMLIKE_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
-#include "FileBase.h"
-#include "FileHandle.h"
-#include "DirHandle.h"
+#include "drivers/FileBase.h"
+#include "drivers/FileHandle.h"
+#include "drivers/DirHandle.h"
 
 namespace mbed {
 

drivers/I2C.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "I2C.h"
+#include "drivers/I2C.h"
 
 #if DEVICE_I2C
 

drivers/I2C.h

@@ -16,18 +16,18 @@
 #ifndef MBED_I2C_H
 #define MBED_I2C_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_I2C
 
-#include "i2c_api.h"
-#include "SingletonPtr.h"
-#include "PlatformMutex.h"
+#include "hal/i2c_api.h"
+#include "platform/SingletonPtr.h"
+#include "platform/PlatformMutex.h"
 
 #if DEVICE_I2C_ASYNCH
-#include "CThunk.h"
-#include "dma_api.h"
-#include "FunctionPointer.h"
+#include "platform/CThunk.h"
+#include "hal/dma_api.h"
+#include "platform/FunctionPointer.h"
 #endif
 
 namespace mbed {

drivers/I2CSlave.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "I2CSlave.h"
+#include "drivers/I2CSlave.h"
 
 #if DEVICE_I2CSLAVE
 

drivers/I2CSlave.h

@@ -16,11 +16,11 @@
 #ifndef MBED_I2C_SLAVE_H
 #define MBED_I2C_SLAVE_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_I2CSLAVE
 
-#include "i2c_api.h"
+#include "hal/i2c_api.h"
 
 namespace mbed {
 

drivers/InterruptIn.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "InterruptIn.h"
+#include "drivers/InterruptIn.h"
 
 #if DEVICE_INTERRUPTIN
 

drivers/InterruptIn.h

@@ -16,15 +16,15 @@
 #ifndef MBED_INTERRUPTIN_H
 #define MBED_INTERRUPTIN_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_INTERRUPTIN
 
-#include "gpio_api.h"
-#include "gpio_irq_api.h"
-#include "Callback.h"
-#include "critical.h"
-#include "toolchain.h"
+#include "hal/gpio_api.h"
+#include "hal/gpio_irq_api.h"
+#include "platform/Callback.h"
+#include "platform/critical.h"
+#include "platform/toolchain.h"
 
 namespace mbed {
 

drivers/InterruptManager.cpp

@@ -1,8 +1,23 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "cmsis.h"
 #if defined(NVIC_NUM_VECTORS)
 
-#include "InterruptManager.h"
-#include "critical.h"
+#include "drivers/InterruptManager.h"
+#include "platform/critical.h"
 #include <string.h>
 
 #define CHAIN_INITIAL_SIZE    4

drivers/InterruptManager.h

@@ -1,9 +1,24 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #ifndef MBED_INTERRUPTMANAGER_H
 #define MBED_INTERRUPTMANAGER_H
 
 #include "cmsis.h"
-#include "CallChain.h"
-#include "PlatformMutex.h"
+#include "platform/CallChain.h"
+#include "platform/PlatformMutex.h"
 #include <string.h>
 
 namespace mbed {

drivers/LocalFileSystem.cpp

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "LocalFileSystem.h"
+#include "drivers/LocalFileSystem.h"
 
 #if DEVICE_LOCALFILESYSTEM
 
-#include "semihost_api.h"
+#include "platform/semihost_api.h"
 #include <string.h>
 #include <stdio.h>
 

drivers/LocalFileSystem.h

@@ -16,12 +16,12 @@
 #ifndef MBED_LOCALFILESYSTEM_H
 #define MBED_LOCALFILESYSTEM_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_LOCALFILESYSTEM
 
-#include "FileSystemLike.h"
-#include "PlatformMutex.h"
+#include "drivers/FileSystemLike.h"
+#include "platform/PlatformMutex.h"
 
 namespace mbed {
 

drivers/LowPowerTicker.h

@@ -16,12 +16,12 @@
 #ifndef MBED_LOWPOWERTICKER_H
 #define MBED_LOWPOWERTICKER_H
 
-#include "platform.h"
-#include "Ticker.h"
+#include "platform/platform.h"
+#include "drivers/Ticker.h"
 
 #if DEVICE_LOWPOWERTIMER
 
-#include "lp_ticker_api.h"
+#include "hal/lp_ticker_api.h"
 
 namespace mbed {
 

drivers/LowPowerTimeout.h

@@ -16,12 +16,12 @@
 #ifndef MBED_LOWPOWERTIMEOUT_H
 #define MBED_LOWPOWERTIMEOUT_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_LOWPOWERTIMER
 
-#include "lp_ticker_api.h"
-#include "LowPowerTicker.h"
+#include "hal/lp_ticker_api.h"
+#include "drivers/LowPowerTicker.h"
 
 namespace mbed {
 

drivers/LowPowerTimer.h

@@ -16,12 +16,12 @@
 #ifndef MBED_LOWPOWERTIMER_H
 #define MBED_LOWPOWERTIMER_H
 
-#include "platform.h"
-#include "Timer.h"
+#include "platform/platform.h"
+#include "drivers/Timer.h"
 
 #if DEVICE_LOWPOWERTIMER
 
-#include "lp_ticker_api.h"
+#include "hal/lp_ticker_api.h"
 
 namespace mbed {
 

drivers/PortIn.h

@@ -16,12 +16,12 @@
 #ifndef MBED_PORTIN_H
 #define MBED_PORTIN_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_PORTIN
 
-#include "port_api.h"
-#include "critical.h"
+#include "hal/port_api.h"
+#include "platform/critical.h"
 
 namespace mbed {
 

drivers/PortInOut.h

@@ -16,12 +16,12 @@
 #ifndef MBED_PORTINOUT_H
 #define MBED_PORTINOUT_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_PORTINOUT
 
-#include "port_api.h"
-#include "critical.h"
+#include "hal/port_api.h"
+#include "platform/critical.h"
 
 namespace mbed {
 

drivers/PortOut.h

@@ -16,12 +16,12 @@
 #ifndef MBED_PORTOUT_H
 #define MBED_PORTOUT_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_PORTOUT
 
-#include "port_api.h"
-#include "critical.h"
+#include "hal/port_api.h"
+#include "platform/critical.h"
 
 namespace mbed {
 /** A multiple pin digital out

drivers/PwmOut.h

@@ -16,11 +16,11 @@
 #ifndef MBED_PWMOUT_H
 #define MBED_PWMOUT_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_PWMOUT
-#include "pwmout_api.h"
-#include "critical.h"
+#include "hal/pwmout_api.h"
+#include "platform/critical.h"
 
 namespace mbed {
 

drivers/RawSerial.cpp

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "RawSerial.h"
-#include "wait_api.h"
+#include "drivers/RawSerial.h"
+#include "platform/wait_api.h"
 #include <cstdarg>
 
 #if DEVICE_SERIAL

drivers/RawSerial.h

@@ -16,12 +16,12 @@
 #ifndef MBED_RAW_SERIAL_H
 #define MBED_RAW_SERIAL_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_SERIAL
 
-#include "SerialBase.h"
-#include "serial_api.h"
+#include "drivers/SerialBase.h"
+#include "hal/serial_api.h"
 
 namespace mbed {
 

drivers/SPI.cpp

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "SPI.h"
-#include "critical.h"
+#include "drivers/SPI.h"
+#include "platform/critical.h"
 
 #if DEVICE_SPI
 

drivers/SPI.h

@@ -16,20 +16,20 @@
 #ifndef MBED_SPI_H
 #define MBED_SPI_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_SPI
 
-#include "PlatformMutex.h"
-#include "spi_api.h"
-#include "SingletonPtr.h"
+#include "platform/PlatformMutex.h"
+#include "hal/spi_api.h"
+#include "platform/SingletonPtr.h"
 
 #if DEVICE_SPI_ASYNCH
-#include "CThunk.h"
-#include "dma_api.h"
-#include "CircularBuffer.h"
-#include "FunctionPointer.h"
-#include "Transaction.h"
+#include "platform/CThunk.h"
+#include "hal/dma_api.h"
+#include "platform/CircularBuffer.h"
+#include "platform/FunctionPointer.h"
+#include "platform/Transaction.h"
 #endif
 
 namespace mbed {

drivers/SPISlave.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "SPISlave.h"
+#include "drivers/SPISlave.h"
 
 #if DEVICE_SPISLAVE
 

drivers/SPISlave.h

@@ -16,11 +16,11 @@
 #ifndef MBED_SPISLAVE_H
 #define MBED_SPISLAVE_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_SPISLAVE
 
-#include "spi_api.h"
+#include "hal/spi_api.h"
 
 namespace mbed {
 

drivers/Serial.cpp

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Serial.h"
-#include "wait_api.h"
+#include "drivers/Serial.h"
+#include "platform/wait_api.h"
 
 #if DEVICE_SERIAL
 

drivers/Serial.h

@@ -16,7 +16,7 @@
 #ifndef MBED_SERIAL_H
 #define MBED_SERIAL_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_SERIAL
 

drivers/SerialBase.cpp

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "SerialBase.h"
-#include "wait_api.h"
-#include "critical.h"
+#include "drivers/SerialBase.h"
+#include "platform/wait_api.h"
+#include "platform/critical.h"
 
 #if DEVICE_SERIAL
 

drivers/SerialBase.h

@@ -16,7 +16,7 @@
 #ifndef MBED_SERIALBASE_H
 #define MBED_SERIALBASE_H
 
-#include "platform.h"
+#include "platform/platform.h"
 
 #if DEVICE_SERIAL
 

drivers/Stream.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Stream.h"
+#include "drivers/Stream.h"
 
 namespace mbed {
 

drivers/Stream.h

@@ -16,8 +16,8 @@
 #ifndef MBED_STREAM_H
 #define MBED_STREAM_H
 
-#include "platform.h"
-#include "FileLike.h"
+#include "platform/platform.h"
+#include "drivers/FileLike.h"
 #include <cstdarg>
 
 namespace mbed {

drivers/Ticker.cpp

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Ticker.h"
+#include "drivers/Ticker.h"
 
-#include "TimerEvent.h"
-#include "FunctionPointer.h"
-#include "ticker_api.h"
-#include "critical.h"
+#include "drivers/TimerEvent.h"
+#include "platform/FunctionPointer.h"
+#include "hal/ticker_api.h"
+#include "platform/critical.h"
 
 namespace mbed {
 

drivers/Ticker.h

@@ -16,9 +16,9 @@
 #ifndef MBED_TICKER_H
 #define MBED_TICKER_H
 
-#include "TimerEvent.h"
-#include "Callback.h"
-#include "toolchain.h"
+#include "drivers/TimerEvent.h"
+#include "platform/Callback.h"
+#include "platform/toolchain.h"
 
 namespace mbed {
 

drivers/Timeout.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Timeout.h"
+#include "drivers/Timeout.h"
 
 namespace mbed {
 

drivers/Timeout.h

@@ -16,7 +16,7 @@
 #ifndef MBED_TIMEOUT_H
 #define MBED_TIMEOUT_H
 
-#include "Ticker.h"
+#include "drivers/Ticker.h"
 
 namespace mbed {
 

drivers/Timer.cpp

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Timer.h"
-#include "ticker_api.h"
-#include "us_ticker_api.h"
-#include "critical.h"
+#include "drivers/Timer.h"
+#include "hal/ticker_api.h"
+#include "hal/us_ticker_api.h"
+#include "platform/critical.h"
 
 namespace mbed {
 

drivers/Timer.h

@@ -16,8 +16,8 @@
 #ifndef MBED_TIMER_H
 #define MBED_TIMER_H
 
-#include "platform.h"
-#include "ticker_api.h"
+#include "platform/platform.h"
+#include "hal/ticker_api.h"
 
 namespace mbed {
 

drivers/TimerEvent.cpp

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "TimerEvent.h"
+#include "drivers/TimerEvent.h"
 #include "cmsis.h"
 
 #include <stddef.h>
-#include "ticker_api.h"
-#include "us_ticker_api.h"
+#include "hal/ticker_api.h"
+#include "hal/us_ticker_api.h"
 
 namespace mbed {
 

drivers/TimerEvent.h

@@ -16,8 +16,8 @@
 #ifndef MBED_TIMEREVENT_H
 #define MBED_TIMEREVENT_H
 
-#include "ticker_api.h"
-#include "us_ticker_api.h"
+#include "hal/ticker_api.h"
+#include "hal/us_ticker_api.h"
 
 namespace mbed {
 

events/Event.h

@@ -16,8 +16,8 @@
 #ifndef EVENT_H
 #define EVENT_H
 
-#include "EventQueue.h"
-#include "mbed_assert.h"
+#include "events/EventQueue.h"
+#include "platform/mbed_assert.h"
 
 namespace events {
 

events/EventQueue.cpp

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "EventQueue.h"
+#include "events/EventQueue.h"
 
-#include "mbed_events.h"
+#include "events/mbed_events.h"
 #include "mbed.h"
 
 

events/EventQueue.h

@@ -17,7 +17,7 @@
 #define EVENT_QUEUE_H
 
 #include "equeue/equeue.h"
-#include "Callback.h"
+#include "platform/Callback.h"
 #include <cstddef>
 #include <new>
 

events/equeue/equeue.c

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "equeue.h"
+#include "equeue/equeue.h"
 
 #include <stdlib.h>
 #include <string.h>

events/equeue/equeue.h

@@ -23,7 +23,7 @@ extern "C" {
 #endif
 
 // Platform specific files
-#include "equeue_platform.h"
+#include "equeue/equeue_platform.h"
 
 #include <stddef.h>
 #include <stdint.h>

events/equeue/equeue_mbed.cpp

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "equeue_platform.h"
+#include "equeue/equeue_platform.h"
 
 #if defined(EQUEUE_PLATFORM_MBED)
 

events/equeue/equeue_posix.c

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "equeue_platform.h"
+#include "equeue/equeue_platform.h"
 
 #if defined(EQUEUE_PLATFORM_POSIX)
 

events/mbed_events.h

@@ -22,8 +22,8 @@
 
 #ifdef __cplusplus
 
-#include "EventQueue.h"
-#include "Event.h"
+#include "events/EventQueue.h"
+#include "events/Event.h"
 
 using namespace events;
 

features/FEATURE_LWIP/TESTS/mbedmicro-net/nist_internet_time_service/main.cpp

@@ -1,5 +1,5 @@
-#if !FEATURE_IPV4
-    #error [NOT_SUPPORTED] IPV4 not supported for this target
+#if !FEATURE_LWIP
+    #error [NOT_SUPPORTED] LWIP not supported for this target
 #endif
 
 #include "mbed.h"

features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_client_echo/main.cpp

@@ -1,5 +1,5 @@
-#if !FEATURE_IPV4
-    #error [NOT_SUPPORTED] IPV4 not supported for this target
+#if !FEATURE_LWIP
+    #error [NOT_SUPPORTED] LWIP not supported for this target
 #endif
 
 #include "mbed.h"

features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_client_hello_world/main.cpp

@@ -1,5 +1,5 @@
-#if !FEATURE_IPV4
-    #error [NOT_SUPPORTED] IPV4 not supported for this target
+#if !FEATURE_LWIP
+    #error [NOT_SUPPORTED] LWIP not supported for this target
 #endif
 
 #include <algorithm>

features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo_client/main.cpp

@@ -1,5 +1,5 @@
-#if !FEATURE_IPV4
-    #error [NOT_SUPPORTED] IPV4 not supported for this target
+#if !FEATURE_LWIP
+    #error [NOT_SUPPORTED] LWIP not supported for this target
 #endif
 
 #include "mbed.h"