直接引用头文件，避免SmartOS上层需要包含太多的头部目录

App/Alarm.h

@@ -2,8 +2,8 @@
 #define __Alarm_H__
 
 #include "Sys.h"
-#include "Timer.h"
-#include "Port.h"
+#include "Device\Timer.h"
+#include "Device\Port.h"
 #include "Config.h"
 #include "Message\BinaryPair.h"
 #include "Message\DataStore.h"

App/BlinkPort.cpp

@@ -1,5 +1,5 @@
 #include "BlinkPort.h"
-#include "Task.h"
+#include "Kernel\Task.h"
 
 static void BlinkTask(void* param);
 

App/BlinkPort.h

@@ -2,7 +2,7 @@
 #define __BlinkPort_H__
 
 #include "Sys.h"
-#include "Port.h"
+#include "Device\Port.h"
 
 // 闪烁端口
 class BlinkPort

App/Button.h

@@ -2,7 +2,7 @@
 #define __BUTTON_H__
 
 #include "Sys.h"
-#include "Port.h"
+#include "Device\Port.h"
 #include "Message\DataStore.h"
 
 // 面板按钮

App/Button_GrayLevel.cpp

@@ -1,8 +1,8 @@
 #include "Sys.h"
-#include "Task.h"
-#include "Port.h"
+#include "Kernel\Task.h"
+#include "Device\Port.h"
 
-#include "Timer.h"
+#include "Device\Timer.h"
 
 #include "Button_GrayLevel.h"
 #include "Device\WatchDog.h"

App/Button_GrayLevel.h

@@ -1,8 +1,8 @@
 #ifndef __BUTTON_GRAY_LEVEL_H__
 #define __BUTTON_GRAY_LEVEL_H__
 
-#include "Port.h"
-#include "Pwm.h"
+#include "Device\Port.h"
+#include "Device\Pwm.h"
 #include "Message\DataStore.h"
 
 struct ButtonPin

App/Button_magnetic.h

@@ -2,7 +2,7 @@
 #define __BUTTON_H__
 
 #include "Sys.h"
-#include "Port.h"
+#include "Device\Port.h"
 
 // 面板按钮
 // 这里必须使用_packed关键字，生成对齐的代码，否则_Value只占一个字节，导致后面的成员进行内存操作时错乱

App/CommandPort.cpp

@@ -1,5 +1,5 @@
 #include "CommandPort.h"
-#include "Task.h"
+#include "Kernel\Task.h"
 
 static void CommandTask(void* param);
 

App/CommandPort.h

@@ -2,7 +2,7 @@
 #define __CommandPort_H__
 
 #include "Sys.h"
-#include "Port.h"
+#include "Device\Port.h"
 
 // 命令端口。通过命令来控制输出口开关、取反、延时打开、打开延迟等高级功能
 class CommandPort

App/FlushPort.cpp

@@ -1,5 +1,5 @@
 #include "FlushPort.h"
-#include "Task.h"
+#include "Kernel\Task.h"
 
 FlushPort::FlushPort()
 {

App/FlushPort.h

@@ -2,7 +2,7 @@
 #define __FlushPort_H__
 
 #include "Sys.h"
-#include "Port.h"
+#include "Device\Port.h"
 #include "Message\DataStore.h"
 
 // 闪烁端口

App/IR.cpp

@@ -1,5 +1,5 @@
 #include "Sys.h"
-#include "TTime.h"
+#include "Kernel\TTime.h"
 
 #include "IR.h"
 

App/IR.h

@@ -2,9 +2,9 @@
 #ifndef __IR_H__
 #define __IR_H__
 
-#include "Buffer.h"
-#include "Pwm.h"
-#include "Port.h"
+#include "Sys.h"
+#include "Device\Pwm.h"
+#include "Device\Port.h"
 
 /*
 	因为引脚跟定时器不是一一对应 还有 remap的关系   引脚不好处理需自行初始化引脚

App/Sensor.h

@@ -2,7 +2,7 @@
 #define __SENSOR_H__
 
 #include "Sys.h"
-#include "Port.h"
+#include "Device\Port.h"
 
 
 class Sensor

App/Sound.h

@@ -3,8 +3,8 @@
 #define __Music_H__
 
 #include "Sys.h"
-#include "Timer.h"
-#include "Port.h"
+#include "Device\Timer.h"
+#include "Device\Port.h"
 
 typedef struct		// 单个音节
 {

Board/AP0103.cpp

@@ -1,9 +1,9 @@
 #include "AP0103.h"
 
-#include "Task.h"
+#include "Kernel\Task.h"
 
-#include "SerialPort.h"
-#include "WatchDog.h"
+#include "Device\SerialPort.h"
+#include "Device\WatchDog.h"
 #include "Config.h"
 
 #include "Drivers\NRF24L01.h"

Board/AP0104.cpp

@@ -1,9 +1,9 @@
 #include "AP0104.h"
 
-#include "Task.h"
+#include "Kernel\Task.h"
 
-#include "SerialPort.h"
-#include "WatchDog.h"
+#include "Device\SerialPort.h"
+#include "Device\WatchDog.h"
 #include "Config.h"
 
 #include "Drivers\NRF24L01.h"

Board/AP0801.cpp

@@ -1,8 +1,8 @@
 #include "AP0801.h"
 
-#include "Task.h"
+#include "Kernel\Task.h"
 
-#include "WatchDog.h"
+#include "Device\WatchDog.h"
 #include "Config.h"
 
 #include "Drivers\NRF24L01.h"

Board/AP0802.cpp

@@ -1,8 +1,8 @@
 #include "AP0802.h"
 
-#include "Task.h"
+#include "Kernel\Task.h"
 
-#include "WatchDog.h"
+#include "Device\WatchDog.h"
 #include "Config.h"
 
 #include "Drivers\NRF24L01.h"

Board/IOK027X.cpp

@@ -1,8 +1,8 @@
 #include "IOK027X.h"
 
-#include "Task.h"
+#include "Kernel\Task.h"
 
-#include "WatchDog.h"
+#include "Device\WatchDog.h"
 #include "Config.h"
 
 #include "Drivers\Esp8266\Esp8266.h"

Board/IOK0612.cpp

@@ -1,8 +1,8 @@
 #include "IOK0612.h"
 
-#include "Task.h"
+#include "Kernel\Task.h"
 
-#include "WatchDog.h"
+#include "Device\WatchDog.h"
 #include "Config.h"
 
 #include "Drivers\Esp8266\Esp8266.h"

Board/Pandora.cpp

@@ -1,8 +1,8 @@
 #include "Pandora.h"
 
-#include "Task.h"
+#include "Kernel\Task.h"
 
-#include "WatchDog.h"
+#include "Device\WatchDog.h"
 #include "Config.h"
 
 #include "Device\Spi.h"

Device/Flash.h

@@ -1,8 +1,6 @@
 #ifndef __Flash_H__
 #define __Flash_H__
 
-#include "Sys.h"
-#include "Device\Port.h"
 #include "Storage\Storage.h"
 
 // Flash类

Device/Power.cpp

@@ -1,6 +1,6 @@
 #include "Device\Power.h"
 
-#include "WatchDog.h"
+#include "Device\WatchDog.h"
 
 // 低功耗处理器
 static List<Power*>	_powers;

Device/Proxy.h

@@ -2,7 +2,7 @@
 #define __Proxy_H__
 
 #include "Sys.h"
-#include "SerialPort.h"
+#include "Device\SerialPort.h"
 #include "ProxyConfig.h"
 
 class Proxy

Device/ProxyConfig.h

@@ -2,7 +2,7 @@
 #define __ProxyCfg_H__
 
 #include "Sys.h"
-#include "../Config.h"
+#include "Config.h"
 
 class ProxyConfig : public ConfigBase
 {

Device/SerialPort.h

@@ -2,8 +2,8 @@
 #define __SerialPort_H__
 
 #include "Core\Queue.h"
-#include "Device\Port.h"
-#include "Device\Power.h"
+#include "Port.h"
+#include "Power.h"
 #include "Net\ITransport.h"
 
 #define SERIAL_BAUDRATE 1024000

Device/UTPort.h

@@ -2,7 +2,7 @@
 #define __UTPort_H__
 
 #include "Sys.h"
-#include "SerialPort.h"
+#include "Device\SerialPort.h"
 #include "Message/Pair.h"
 
 enum  PacketEorrCode : byte

Drivers/74HC165.h

@@ -1,8 +1,8 @@
 #ifndef _74HC165_H_
 #define _74HC165_H_
 
-#include "Port.h"
-#include "Power.h"
+#include "Device\Port.h"
+#include "Device\Power.h"
 
 // 温湿度传感器
 class IC74HC165

Drivers/74HC165Monitor.h

@@ -1,8 +1,8 @@
 #ifndef _74HC165MOR_H_
 #define _74HC165MOR_H_
 
-#include "Port.h"
-#include "Power.h"
+#include "Device\Port.h"
+#include "Device\Power.h"
 
 /* 备注
 调用构造函数后 需要Open()一下

Drivers/AT24CXX.h

@@ -1,8 +1,8 @@
 #ifndef _AT24CXX_H_
 #define _AT24CXX_H_
 
-#include "I2C.h"
-#include "..\Storage\Storage.h"
+#include "Device\I2C.h"
+#include "Storage\Storage.h"
 
 // EEPROM
 class AT24CXX : public CharStorage

Drivers/AT45DB.cpp

@@ -1,6 +1,6 @@
 #include "Sys.h"
-#include "Port.h"
-#include "Spi.h"
+#include "Device\Port.h"
+#include "Device\Spi.h"
 #include "AT45DB.h"
 
 #define Dummy_Byte 0xA5

Drivers/AT45DB.h

@@ -2,7 +2,7 @@
 #define __AT45DB_H__
 
 #include "Sys.h"
-#include "Spi.h"
+#include "Device\Spi.h"
 
 // AT45DB存储Flash
 class AT45DB

Drivers/BH1750.cpp

@@ -1,7 +1,8 @@
-#include "ByteArray.h"
-#include "BH1750.h"
+#include "Sys.h"
 
-#include "I2C.h"
+#include "Device\I2C.h"
+
+#include "BH1750.h"
 
 #define	CMD_PWN_OFF	0x00
 #define	CMD_PWN_ON	0x01

Drivers/BufferPort.cpp

@@ -1,5 +1,5 @@
 #include "BufferPort.h"
-#include "SerialPort.h"
+#include "Device\SerialPort.h"
 
 BufferPort::BufferPort() : Buf()
 {

Drivers/DHT11.h

@@ -1,8 +1,8 @@
 #ifndef _DHT11_H_
 #define _DHT11_H_
 
-#include "Port.h"
-#include "Power.h"
+#include "Device\Port.h"
+#include "Device\Power.h"
 
 // 温湿度传感器
 class DHT11

Drivers/Enc28j60.h

@@ -2,8 +2,8 @@
 #define __Enc28j60_H__
 
 #include "Sys.h"
-#include "Spi.h"
-#include "Power.h"
+#include "Device\Spi.h"
+#include "Device\Power.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 

Drivers/Esp8266/Esp8266.cpp

@@ -1,8 +1,8 @@
 #include "Sys.h"
-#include "Task.h"
-#include "TTime.h"
+#include "Kernel\Task.h"
+#include "Kernel\TTime.h"
 
-#include "SerialPort.h"
+#include "Device\SerialPort.h"
 
 #include "Esp8266.h"
 #include "EspTcp.h"

Drivers/Esp8266/Esp8266.h

@@ -1,7 +1,7 @@
 #ifndef __Esp8266_H__
 #define __Esp8266_H__
 
-#include "Port.h"
+#include "Device\Port.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 #include "Message\DataStore.h"

Drivers/Esp8266/WaitExpect.h

@@ -1,7 +1,7 @@
 #ifndef __WaitExpect_H__
 #define __WaitExpect_H__
 
-#include "WaitHandle.h"
+#include "Kernel\WaitHandle.h"
 
 // 等待
 class WaitExpect

Drivers/HX711.h

@@ -1,8 +1,8 @@
 #ifndef _HX711_H_
 #define _HX711_H_
 
-#include "Port.h"
-#include "Power.h"
+#include "Device\Port.h"
+#include "Device\Power.h"
 
 enum HX711Mode
 {

Drivers/JTW8953.cpp

@@ -1,7 +1,7 @@
 #include "Sys.h"
 #include "JTW8953.h"
 
-#include "I2C.h"
+#include "Device\I2C.h"
 
 #define ADDRESS			0xa6	// 从机的地址和写入标志
 

Drivers/NRF24L01.cpp

@@ -1,5 +1,5 @@
 #include "Sys.h"
-#include "Port.h"
+#include "Device\Port.h"
 #include "NRF24L01.h"
 
 //#define RF_DEBUG DEBUG

Drivers/SHT30.cpp

@@ -1,6 +1,6 @@
 #include "SHT30.h"
 
-#include "I2C.h"
+#include "Device\I2C.h"
 
 #define LITTLE_ENDIAN
 

Drivers/ShunCom.h

@@ -2,8 +2,8 @@
 #define __ShunCom_H__
 
 #include "Sys.h"
-#include "Port.h"
-#include "Power.h"
+#include "Device\Port.h"
+#include "Device\Power.h"
 #include "Net\ITransport.h"
 #include "Message\DataStore.h"
 

Drivers/Sim900A.cpp

@@ -1,5 +1,5 @@
-#include "TTime.h"
-#include "SerialPort.h"
+#include "Kernel\TTime.h"
+#include "Device\SerialPort.h"
 
 #include "Sim900A.h"
 

Drivers/UBlox.cpp

@@ -1,5 +1,5 @@
 #include "UBlox.h"
-#include "SerialPort.h"
+#include "Device\SerialPort.h"
 
 UBlox::UBlox()
 {

Drivers/W5500.cpp

@@ -1,8 +1,8 @@
 #include "stddef.h"
 
 #include "Sys.h"
-#include "Spi.h"
-#include "Power.h"
+#include "Device\Spi.h"
+#include "Device\Power.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 #include "Message\DataStore.h"
@@ -11,8 +11,8 @@
 #include "Net\DNS.h"
 
 #include "W5500.h"
-#include "TTime.h"
-#include "Task.h"
+#include "Kernel\TTime.h"
+#include "Kernel\Task.h"
 
 #include "App\FlushPort.h"
 

Drivers/nrf24l01.h

@@ -2,9 +2,9 @@
 #define __NRF24L01_H__
 
 #include "Sys.h"
-#include "Spi.h"
+#include "Device\Spi.h"
 #include "Net\ITransport.h"
-#include "Power.h"
+#include "Device\Power.h"
 #include "Message\DataStore.h"
 #include "APP\FlushPort.h"
 

Kernel/Thread.cpp

@@ -1,5 +1,5 @@
 #include "Thread.h"
-#include "Task.h"
+#include "Kernel\Task.h"
 #include "Interrupt.h"
 
 //#define TH_DEBUG DEBUG

Platform/CortexM/Thread.cpp

@@ -1,5 +1,6 @@
 #include "Thread.h"
-#include "Task.h"
+#include "Kernel\Task.h"
+#include "Kernel\Interrupt.h"
 
 #include "Platform\stm32.h"
 

Platform/CortexM/Time.cpp

@@ -1,5 +1,7 @@
-#include "TTime.h"
-#include "Timer.h"
+#include "Sys.h"
+#include "Kernel\Interrupt.h"
+#include "Kernel\TTime.h"
+#include "Device\Timer.h"
 
 #include "Platform\stm32.h"
 

Platform/GD32F1x0/DAC.cpp

@@ -1,4 +1,4 @@
-#include "Port.h"
+#include "Device\Port.h"
 #include "DAC.h"
 
 #include "Platform\stm32.h"

Platform/GD32F1x0/Flash.cpp

@@ -1,4 +1,4 @@
-#include "Flash.h"
+#include "Device\Flash.h"
 
 #include "Platform\stm32.h"
 

Platform/GD32F1x0/Port.cpp

@@ -1,5 +1,5 @@
 #include "Sys.h"
-#include "Port.h"
+#include "Device\Port.h"
 
 #include "Platform\stm32.h"
 

Platform/GD32F1x0/Power.cpp

@@ -1,6 +1,6 @@
-#include "Power.h"
+#include "Device\Power.h"
 
-#include "WatchDog.h"
+#include "Device\WatchDog.h"
 
 #include "Platform\stm32.h"
 

Platform/GD32F1x0/Pwm.cpp

@@ -1,6 +1,6 @@
 #include "Sys.h"
 
-#include "Pwm.h"
+#include "Device\Pwm.h"
 
 #include "Platform\stm32.h"
 

Platform/GD32F1x0/RTC.cpp

@@ -1,4 +1,4 @@
-#include "TTime.h"
+#include "Kernel\TTime.h"
 #include "RTC.h"
 
 #include "Platform\stm32.h"

Platform/GD32F1x0/SerialPort.cpp

@@ -1,7 +1,7 @@
 #include "Sys.h"
-#include "Task.h"
+#include "Kernel\Task.h"
 
-#include "SerialPort.h"
+#include "Device\SerialPort.h"
 
 #include "Platform\stm32.h"
 

Platform/GD32F1x0/Spi.cpp

@@ -1,7 +1,7 @@
 #include "Buffer.h"
 #include "Sys.h"
 
-#include "Spi.h"
+#include "Device\Spi.h"
 
 #include "Platform\stm32.h"
 

Platform/GD32F1x0/Timer.cpp

@@ -1,6 +1,6 @@
 #include "Sys.h"
 
-#include "Timer.h"
+#include "Device\Timer.h"
 
 #include "Platform\stm32.h"
 

Platform/GD32F1x0/WatchDog.cpp

@@ -1,4 +1,4 @@
-#include "WatchDog.h"
+#include "Device\WatchDog.h"
 
 #include "Platform\stm32.h"
 

Platform/STM32F0/RTC.cpp

@@ -1,4 +1,4 @@
-#include "TTime.h"
+#include "Kernel\TTime.h"
 #include "RTC.h"
 
 #include "Platform\stm32.h"

Platform/STM32F1/CAN.cpp

@@ -1,5 +1,7 @@
 #include "Sys.h"
-#include "Port.h"
+#include "Kernel\Interrupt.h"
+#include "Device\Port.h"
+
 #include "Can.h"
 
 #include "Platform\stm32.h"

Platform/STM32F1/DAC.cpp

@@ -1,4 +1,4 @@
-#include "Port.h"
+#include "Device\Port.h"
 #include "DAC.h"
 
 #include "Platform\stm32.h"

Platform/STM32F1/Flash.cpp

@@ -1,4 +1,4 @@
-#include "Flash.h"
+#include "Device\Flash.h"
 
 #include "Platform\stm32.h"
 

Platform/STM32F1/Port.cpp

@@ -1,5 +1,6 @@
 #include "Sys.h"
-#include "Port.h"
+#include "Kernel\Interrupt.h"
+#include "Device\Port.h"
 
 #include "Platform\stm32.h"
 

Platform/STM32F1/Power.cpp

@@ -1,6 +1,6 @@
-#include "Power.h"
+#include "Device\Power.h"
 
-#include "WatchDog.h"
+#include "Device\WatchDog.h"
 
 #include "Platform\stm32.h"
 

Platform/STM32F1/Pwm.cpp

@@ -1,6 +1,6 @@
 #include "Sys.h"
 
-#include "Pwm.h"
+#include "Device\Pwm.h"
 
 #include "Platform\stm32.h"
 

Platform/STM32F1/RTC.cpp

@@ -1,5 +1,6 @@
 #include "RTC.h"
-#include "TTime.h"
+#include "Kernel\TTime.h"
+#include "Kernel\Interrupt.h"
 
 #include "Platform\stm32.h"
 

Platform/STM32F1/SerialPort.cpp

@@ -1,7 +1,8 @@
 #include "Sys.h"
-#include "Task.h"
+#include "Kernel\Task.h"
+#include "Kernel\Interrupt.h"
 
-#include "SerialPort.h"
+#include "Device\SerialPort.h"
 
 #include "Platform\stm32.h"
 

Platform/STM32F1/Spi.cpp

@@ -1,7 +1,7 @@
 #include "Buffer.h"
 #include "Sys.h"
 
-#include "Spi.h"
+#include "Device\Spi.h"
 
 #include "Platform\stm32.h"
 

Platform/STM32F1/Timer.cpp

@@ -1,6 +1,7 @@
 #include "Sys.h"
+#include "Kernel\Interrupt.h"
 
-#include "Timer.h"
+#include "Device\Timer.h"
 
 #include "Platform\stm32.h"
 

Platform/STM32F1/WatchDog.cpp

@@ -1,4 +1,4 @@
-#include "WatchDog.h"
+#include "Device\WatchDog.h"
 
 #include "Platform\stm32.h"
 

Platform/STM32F4/RTC.cpp

@@ -1,4 +1,4 @@
-#include "TTime.h"
+#include "Kernel\TTime.h"
 #include "RTC.h"
 
 #include "Platform\stm32.h"

Test/ADCTest.cpp

@@ -1,5 +1,5 @@
 #include "Sys.h"
-#include "ADC.h"
+#include "Device\ADC.h"
 
 void TestADC()
 {

Test/DictionaryTest.cpp

@@ -1,6 +1,5 @@
 #include "Sys.h"
-#include "List.h"
-#include "Dictionary.h"
+#include "Core\Dictionary.h"
 
 #if DEBUG
 void IDictionary::Test()

Test/EthernetTest.cpp

@@ -1,6 +1,6 @@
 #include "Sys.h"
 #include "Drivers\Enc28j60.h"
-#include "SerialPort.h"
+#include "Device\SerialPort.h"
 #include "TinyIP\TinyIP.h"
 #include "TinyIP\Arp.h"
 #include "TinyIP\Icmp.h"

Test/FlashTest.cpp

@@ -1,4 +1,4 @@
-#include "Flash.h"
+#include "Device\Flash.h"
 #include <stdlib.h>
 
 void TestFlash()

Test/MessageTest.cpp

@@ -1,5 +1,5 @@
 #include "Sys.h"
-#include "SerialPort.h"
+#include "Device\SerialPort.h"
 #include "Drivers\NRF24L01.h"
 #include "TinyNet\TinyClient.h"
 

Test/PulsePortTest.cpp

@@ -1,5 +1,5 @@
 #include "App\PulsePort.h"
-#include "Port.h"
+#include "Device\Port.h"
 
 void InitPort();
 

Test/SerialTest.cpp

@@ -1,5 +1,4 @@
-#include "Platform\Pin.h"
-#include "SerialPort.h"
+#include "Device\SerialPort.h"
 
 #ifdef DEBUG
 static uint OnUsartRead(ITransport* transport, Buffer& bs, void* param, void* param2)

Test/StringTest.cpp

@@ -1,5 +1,5 @@
-#include "SString.h"
-#include "TTime.h"
+#include "Core\SString.h"
+#include "Kernel\TTime.h"
 
 #if DEBUG
 

Test/ThreadTest.cpp

@@ -1,6 +1,6 @@
 #include "Sys.h"
-#include "Port.h"
-#include "Thread.h"
+#include "Device\Port.h"
+#include "Kernel\Thread.h"
 
 Thread* th;
 

Test/TimerTest.cpp

@@ -1,6 +1,6 @@
 #include "Sys.h"
-#include "Port.h"
-#include "Timer.h"
+#include "Device\Port.h"
+#include "Device\Timer.h"
 
 //Timer* timer;
 

Test/conf.h

@@ -2,8 +2,8 @@
 #define __TEST_CONF__H__
 
 #include "Sys.h"
-#include "Port.h"
-#include "Spi.h"
+#include "Device\Port.h"
+#include "Device\Spi.h"
 #include "TokenNet\TokenClient.h"
 
 void TestSerial();

TinyIP/Arp.cpp

@@ -1,6 +1,6 @@
 #include "Arp.h"
 
-#include "WaitHandle.h"
+#include "Kernel\WaitHandle.h"
 
 #define NET_DEBUG 0
 

TinyIP/Icmp.cpp

@@ -1,8 +1,8 @@
-#include "TTime.h"
+#include "Kernel\TTime.h"
 #include "Icmp.h"
 #include "Arp.h"
 
-#include "WaitHandle.h"
+#include "Kernel\WaitHandle.h"
 
 #define NET_DEBUG DEBUG
 

TinyIP/Tcp.cpp

@@ -1,6 +1,6 @@
 #include "Tcp.h"
 
-#include "WaitHandle.h"
+#include "Kernel\WaitHandle.h"
 
 #define NET_DEBUG 0
 //#define NET_DEBUG DEBUG

TinyIP/TinyIP.cpp

@@ -1,7 +1,7 @@
 #include "TinyIP.h"
 #include "Arp.h"
 
-#include "Task.h"
+#include "Kernel\Task.h"
 
 #include "Tcp.h"
 #include "Udp.h"

TinyNet/Tiny.cpp

@@ -1,7 +1,7 @@
 #include "Tiny.h"
 
-#include "SerialPort.h"
-#include "WatchDog.h"
+#include "Device\SerialPort.h"
+#include "Device\WatchDog.h"
 #include "Config.h"
 
 #include "Drivers\NRF24L01.h"

TinyNet/Tiny.h

@@ -2,7 +2,7 @@
 #define _Tiny_H_
 
 #include "Sys.h"
-#include "Power.h"
+#include "Device\Power.h"
 #include "Net\ITransport.h"
 
 #include "TinyNet\TinyClient.h"

TinyNet/TinyClient.cpp

@@ -1,4 +1,4 @@
-#include "TTime.h"
+#include "Kernel\TTime.h"
 
 #include "TinyClient.h"
 #include "Security\Crc.h"

TinyNet/TinyServer.cpp

@@ -1,4 +1,4 @@
-#include "Flash.h"
+#include "Device\Flash.h"
 #include "TinyServer.h"
 #include "Security\Crc.h"
 

TokenNet/Device.h

@@ -3,7 +3,6 @@
 
 #include "Sys.h"
 
-#include "Flash.h"
 #include "TinyNet\TinyConfig.h"
 
 /******************************** Device ********************************/

TokenNet/DevicesManagement.h

@@ -4,7 +4,7 @@
 #include "Sys.h"
 #include "Device.h"
 
-#include "Flash.h"
+#include "Device\Flash.h"
 #include "TinyNet\TinyConfig.h"
 #include "Message\BinaryPair.h"
 

TokenNet/Gateway.h

@@ -2,7 +2,7 @@
 #define __SERVER__H__
 
 #include "Sys.h"
-#include "Port.h"
+#include "Device\Port.h"
 #include "Net\ITransport.h"
 #include "Message\DataStore.h"
 #include "TokenClient.h"

TokenNet/Token.cpp

@@ -1,9 +1,9 @@
 #include "Token.h"
 
-#include "Task.h"
+#include "Kernel\Task.h"
 
-#include "SerialPort.h"
-#include "WatchDog.h"
+#include "Device\SerialPort.h"
+#include "Device\WatchDog.h"
 #include "Config.h"
 
 #include "Drivers\NRF24L01.h"

TokenNet/TokenSession.cpp

@@ -1,4 +1,4 @@
-#include "TTime.h"
+#include "Kernel\TTime.h"
 
 #include "Net\Socket.h"
 

Tool/Build_SmartOS_F1_GCC.cs

@@ -20,9 +20,6 @@ namespace NewLife.Reflection
 			build.Cortex = 3;
 			build.Output = "F1";
 			build.AddIncludes("..\\..\\Lib");
-			build.AddIncludes("..\\Core");
-			build.AddIncludes("..\\Kernel");
-			build.AddIncludes("..\\Device");
             build.AddFiles("..\\Core");
             build.AddFiles("..\\Kernel", "*.c;*.cpp", false, "Thread");
             build.AddFiles("..\\Device");