Refactor for a central include directory

CMakeLists.txt

@@ -4,9 +4,7 @@ project(icsneonext VERSION 0.1.0)
 set(CMAKE_CXX_STANDARD 11)
 
 include(GNUInstallDirs)
-
-message(STATUS "icsneo source dir ${CMAKE_CURRENT_SOURCE_DIR}")
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 # Enable Warnings
 if(MSVC)

api/icsneoc/icsneoc.cpp

@@ -4,9 +4,9 @@
 
 #define ICSNEOC_MAKEDLL
 
-#include "include/icsneoc.h"
-#include "api/icsneocpp/include/icsneocpp.h"
-#include "platform/include/dynamiclib.h"
+#include "icsneo/icsneoc.h"
+#include "icsneo/icsneocpp.h"
+#include "icsneo/platform/dynamiclib.h"
 #include <string>
 #include <vector>
 #include <memory>

api/icsneocpp/icsneocpp.cpp

@@ -1,8 +1,8 @@
 #include <iterator>
 #include <iostream>
 
-#include "include/icsneocpp.h"
-#include "device/include/devicefinder.h"
+#include "icsneo/icsneocpp.h"
+#include "icsneo/device/devicefinder.h"
 
 using namespace icsneo;
 

api/icsneolegacy/dllhelper/icsneo40DLLAPI.h

@@ -1,7 +1,7 @@
 //FILE: icsneo40DLLAPI.H
 
 #include <windows.h>
-#include "icsnVC40.h"
+#include "icsneo/icsnVC40.h"
 
 
 

api/icsneolegacy/icsneolegacy.cpp

@@ -3,12 +3,12 @@
 #endif
 
 #define ICSNEOC_MAKEDLL
-#include "api/icsneolegacy/include/icsneolegacy.h"
+#include "icsneo/icsneolegacy.h"
 
 #undef ICSNEOC_MAKEDLL
-#include "api/icsneoc/include/icsneoc.h"
+#include "icsneo/icsneoc.h"
 
-#include "communication/include/network.h"
+#include "icsneo/communication/network.h"
 #include <map>
 #include <algorithm>
 

communication/communication.cpp

@@ -1,4 +1,4 @@
-#include "communication/include/communication.h"
+#include "icsneo/communication/communication.h"
 #include <chrono>
 #include <iostream>
 #include <queue>
@@ -6,11 +6,11 @@
 #include <cstring>
 #include <mutex>
 #include <condition_variable>
-#include "communication/include/command.h"
-#include "communication/include/decoder.h"
-#include "communication/include/packetizer.h"
-#include "communication/message/include/serialnumbermessage.h"
-#include "communication/message/filter/include/main51messagefilter.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/communication/decoder.h"
+#include "icsneo/communication/packetizer.h"
+#include "icsneo/communication/message/serialnumbermessage.h"
+#include "icsneo/communication/message/filter/main51messagefilter.h"
 
 using namespace icsneo;
 

communication/decoder.cpp

@@ -1,9 +1,9 @@
-#include "communication/include/decoder.h"
-#include "communication/include/communication.h"
-#include "communication/message/include/serialnumbermessage.h"
-#include "communication/message/include/resetstatusmessage.h"
-#include "communication/include/command.h"
-#include "device/include/device.h"
+#include "icsneo/communication/decoder.h"
+#include "icsneo/communication/communication.h"
+#include "icsneo/communication/message/serialnumbermessage.h"
+#include "icsneo/communication/message/resetstatusmessage.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/device/device.h"
 #include <iostream>
 
 using namespace icsneo;

communication/encoder.cpp

@@ -1,4 +1,4 @@
-#include "communication/include/encoder.h"
+#include "icsneo/communication/encoder.h"
 
 using namespace icsneo;
 

communication/icommunication.cpp

@@ -1,4 +1,4 @@
-#include "communication/include/icommunication.h"
+#include "icsneo/communication/icommunication.h"
 
 using namespace icsneo;
 

communication/message/neomessage.cpp

@@ -1,5 +1,5 @@
-#include "communication/message/include/neomessage.h"
-#include "communication/message/include/canmessage.h"
+#include "icsneo/communication/message/neomessage.h"
+#include "icsneo/communication/message/canmessage.h"
 
 using namespace icsneo;
 

communication/multichannelcommunication.cpp

@@ -1,7 +1,7 @@
-#include "communication/include/multichannelcommunication.h"
-#include "communication/include/command.h"
-#include "communication/include/decoder.h"
-#include "communication/include/packetizer.h"
+#include "icsneo/communication/multichannelcommunication.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/communication/decoder.h"
+#include "icsneo/communication/packetizer.h"
 #include <iostream>
 #include <iomanip>
 

communication/packetizer.cpp

@@ -1,4 +1,4 @@
-#include "communication/include/packetizer.h"
+#include "icsneo/communication/packetizer.h"
 #include <iostream>
 #include <iomanip>
 

device/device.cpp

@@ -1,6 +1,6 @@
-#include "include/device.h"
-#include "communication/message/callback/include/messagecallback.h"
-#include "communication/include/command.h"
+#include "icsneo/device/device.h"
+#include "icsneo/communication/message/callback/messagecallback.h"
+#include "icsneo/communication/command.h"
 #include <string.h>
 #include <iostream>
 #include <sstream>

device/devicefinder.cpp

@@ -1,5 +1,5 @@
-#include "device/include/devicefinder.h"
-#include "platform/include/devices.h"
+#include "icsneo/device/devicefinder.h"
+#include "icsneo/platform/devices.h"
 
 using namespace icsneo;
 

device/idevicesettings.cpp

@@ -1,5 +1,5 @@
-#include "device/include/idevicesettings.h"
-#include "communication/message/filter/include/main51messagefilter.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/communication/message/filter/main51messagefilter.h"
 #include <cstring>
 
 using namespace icsneo;

include/icsneo/communication/communication.h

@@ -1,15 +1,15 @@
 #ifndef __COMMUNICATION_H_
 #define __COMMUNICATION_H_
 
-#include "communication/include/icommunication.h"
-#include "communication/include/command.h"
-#include "communication/include/network.h"
-#include "communication/include/packet.h"
-#include "communication/message/callback/include/messagecallback.h"
-#include "communication/message/include/serialnumbermessage.h"
-#include "communication/include/packetizer.h"
-#include "communication/include/encoder.h"
-#include "communication/include/decoder.h"
+#include "icsneo/communication/icommunication.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/packet.h"
+#include "icsneo/communication/message/callback/messagecallback.h"
+#include "icsneo/communication/message/serialnumbermessage.h"
+#include "icsneo/communication/packetizer.h"
+#include "icsneo/communication/encoder.h"
+#include "icsneo/communication/decoder.h"
 #include <memory>
 #include <vector>
 #include <atomic>

include/icsneo/communication/decoder.h

@@ -1,10 +1,10 @@
 #ifndef __DECODER_H_
 #define __DECODER_H_
 
-#include "communication/message/include/message.h"
-#include "communication/message/include/canmessage.h"
-#include "communication/include/packet.h"
-#include "communication/include/network.h"
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/message/canmessage.h"
+#include "icsneo/communication/packet.h"
+#include "icsneo/communication/network.h"
 #include <queue>
 #include <vector>
 #include <memory>

include/icsneo/communication/encoder.h

@@ -1,12 +1,12 @@
 #ifndef __ENCODER_H_
 #define __ENCODER_H_
 
-#include "communication/message/include/message.h"
-#include "communication/message/include/canmessage.h"
-#include "communication/include/packet.h"
-#include "communication/include/command.h"
-#include "communication/include/network.h"
-#include "communication/include/packetizer.h"
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/message/canmessage.h"
+#include "icsneo/communication/packet.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/packetizer.h"
 #include <queue>
 #include <vector>
 #include <memory>

include/icsneo/communication/icommunication.h

@@ -5,7 +5,7 @@
 #include <chrono>
 #include <atomic>
 #include <thread>
-#include "third-party/concurrentqueue/blockingconcurrentqueue.h"
+#include "icsneo/third-party/concurrentqueue/blockingconcurrentqueue.h"
 
 namespace icsneo {
 

include/icsneo/communication/message/callback/canmessagecallback.h

@@ -1,9 +1,9 @@
 #ifndef __CANMESSAGECALLBACK_H_
 #define __CANMESSAGECALLBACK_H_
 
-#include "communication/message/callback/include/messagecallback.h"
-#include "communication/message/include/canmessage.h"
-#include "communication/message/filter/include/canmessagefilter.h"
+#include "icsneo/communication/message/callback/messagecallback.h"
+#include "icsneo/communication/message/canmessage.h"
+#include "icsneo/communication/message/filter/canmessagefilter.h"
 #include <memory>
 
 namespace icsneo {

include/icsneo/communication/message/callback/main51messagecallback.h

@@ -1,9 +1,9 @@
 #ifndef __MAIN51MESSAGECALLBACK_H_
 #define __MAIN51MESSAGECALLBACK_H_
 
-#include "communication/message/callback/include/messagecallback.h"
-#include "communication/message/include/main51message.h"
-#include "communication/message/filter/include/main51messagefilter.h"
+#include "icsneo/communication/message/callback/messagecallback.h"
+#include "icsneo/communication/message/main51message.h"
+#include "icsneo/communication/message/filter/main51messagefilter.h"
 #include <memory>
 
 namespace icsneo {

include/icsneo/communication/message/callback/messagecallback.h

@@ -1,8 +1,8 @@
 #ifndef __MESSAGECALLBACK_H_
 #define __MESSAGECALLBACK_H_
 
-#include "communication/message/include/message.h"
-#include "communication/message/filter/include/messagefilter.h"
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/message/filter/messagefilter.h"
 #include <memory>
 #include <functional>
 

include/icsneo/communication/message/canmessage.h

@@ -1,7 +1,7 @@
 #ifndef __CANMESSAGE_H_
 #define __CANMESSAGE_H_
 
-#include "communication/message/include/message.h"
+#include "icsneo/communication/message/message.h"
 
 namespace icsneo {
 

include/icsneo/communication/message/filter/canmessagefilter.h

@@ -1,10 +1,10 @@
 #ifndef __CANMESSAGEFILTER_H_
 #define __CANMESSAGEFILTER_H_
 
-#include "communication/message/filter/include/messagefilter.h"
-#include "communication/include/network.h"
-#include "communication/message/include/message.h"
-#include "communication/message/include/canmessage.h"
+#include "icsneo/communication/message/filter/messagefilter.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/message/canmessage.h"
 #include <memory>
 
 namespace icsneo {

include/icsneo/communication/message/filter/main51messagefilter.h

@@ -1,10 +1,10 @@
 #ifndef __MAIN51MESSAGEFILTER_H_
 #define __MAIN51MESSAGEFILTER_H_
 
-#include "communication/message/filter/include/messagefilter.h"
-#include "communication/include/network.h"
-#include "communication/include/communication.h"
-#include "communication/message/include/main51message.h"
+#include "icsneo/communication/message/filter/messagefilter.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/communication.h"
+#include "icsneo/communication/message/main51message.h"
 #include <memory>
 #include <iostream>
 

include/icsneo/communication/message/filter/messagefilter.h

@@ -1,8 +1,8 @@
 #ifndef __MESSAGEFILTER_H_
 #define __MESSAGEFILTER_H_
 
-#include "communication/include/network.h"
-#include "communication/message/include/message.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/message/message.h"
 #include <memory>
 
 namespace icsneo {

include/icsneo/communication/message/main51message.h

@@ -1,8 +1,8 @@
 #ifndef __MAIN51MESSAGE_H_
 #define __MAIN51MESSAGE_H_
 
-#include "communication/message/include/message.h"
-#include "communication/include/communication.h"
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/communication.h"
 
 namespace icsneo {
 

include/icsneo/communication/message/message.h

@@ -1,7 +1,7 @@
 #ifndef __MESSAGE_H_
 #define __MESSAGE_H_
 
-#include "communication/include/network.h"
+#include "icsneo/communication/network.h"
 #include <vector>
 
 namespace icsneo {

include/icsneo/communication/message/neomessage.h

@@ -119,7 +119,7 @@ typedef struct {
 #pragma pack(pop)
 
 #ifdef __cplusplus
-#include "communication/message/include/message.h"
+#include "icsneo/communication/message/message.h"
 #include <memory>
 
 static_assert(sizeof(neomessage_can_t) == sizeof(neomessage_t), "All types of neomessage_t must be the same size!");

include/icsneo/communication/message/resetstatusmessage.h

@@ -1,8 +1,8 @@
 #ifndef __RESETSTATUSMESSAGE_H_
 #define __RESETSTATUSMESSAGE_H_
 
-#include "communication/message/include/main51message.h"
-#include "communication/include/command.h"
+#include "icsneo/communication/message/main51message.h"
+#include "icsneo/communication/command.h"
 #include <string>
 
 namespace icsneo {

include/icsneo/communication/message/serialnumbermessage.h

@@ -1,8 +1,8 @@
 #ifndef __SERIALNUMBERMESSAGE_H_
 #define __SERIALNUMBERMESSAGE_H_
 
-#include "communication/message/include/main51message.h"
-#include "communication/include/command.h"
+#include "icsneo/communication/message/main51message.h"
+#include "icsneo/communication/command.h"
 #include <string>
 
 namespace icsneo {

include/icsneo/communication/multichannelcommunication.h

@@ -1,10 +1,10 @@
 #ifndef __MULTICHANNELCOMMUNICATION_H_
 #define __MULTICHANNELCOMMUNICATION_H_
 
-#include "communication/include/communication.h"
-#include "communication/include/icommunication.h"
-#include "communication/include/command.h"
-#include "communication/include/encoder.h"
+#include "icsneo/communication/communication.h"
+#include "icsneo/communication/icommunication.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/communication/encoder.h"
 
 namespace icsneo {
 

include/icsneo/communication/packet.h

@@ -1,7 +1,7 @@
 #ifndef __PACKET_H_
 #define __PACKET_H_
 
-#include "communication/include/network.h"
+#include "icsneo/communication/network.h"
 #include <vector>
 #include <stdint.h>
 

include/icsneo/communication/packetizer.h

@@ -1,7 +1,7 @@
 #ifndef __PACKETIZER_H_
 #define __PACKETIZER_H_
 
-#include "communication/include/packet.h"
+#include "icsneo/communication/packet.h"
 #include <queue>
 #include <vector>
 #include <memory>

include/icsneo/device/device.h

@@ -4,15 +4,15 @@
 #include <vector>
 #include <memory>
 #include <cstring>
-#include "device/include/neodevice.h"
-#include "device/include/idevicesettings.h"
-#include "device/include/devicetype.h"
-#include "communication/include/communication.h"
-#include "communication/include/packetizer.h"
-#include "communication/include/encoder.h"
-#include "communication/include/decoder.h"
-#include "communication/message/include/resetstatusmessage.h"
-#include "third-party/concurrentqueue/concurrentqueue.h"
+#include "icsneo/device/neodevice.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/communication/communication.h"
+#include "icsneo/communication/packetizer.h"
+#include "icsneo/communication/encoder.h"
+#include "icsneo/communication/decoder.h"
+#include "icsneo/communication/message/resetstatusmessage.h"
+#include "icsneo/third-party/concurrentqueue/concurrentqueue.h"
 
 namespace icsneo {
 

include/icsneo/device/devicefinder.h

@@ -1,7 +1,7 @@
 #ifndef __DEVICEFINDER_H_
 #define __DEVICEFINDER_H_
 
-#include "device/include/device.h"
+#include "icsneo/device/device.h"
 #include <vector>
 #include <memory>
 

include/icsneo/device/idevicesettings.h

@@ -271,7 +271,7 @@ typedef struct _UART_SETTINGS
 #pragma pack(pop)
 
 #ifdef __cplusplus
-#include "communication/include/communication.h"
+#include "icsneo/communication/communication.h"
 #include <iostream>
 
 namespace icsneo {

include/icsneo/device/neodevice.h

@@ -2,7 +2,7 @@
 #define __NEODEVICE_H_
 
 #include <stdint.h>
-#include "device/include/devicetype.h"
+#include "icsneo/device/devicetype.h"
 
 #ifdef __cplusplus
 // A forward declaration is needed as there is a circular dependency

include/icsneo/device/neoobd2pro/neoobd2pro.h

@@ -1,9 +1,9 @@
 #ifndef __NEOOBD2PRO_H_
 #define __NEOOBD2PRO_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/stm32.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
 
 namespace icsneo {
 

include/icsneo/device/neoobd2sim/neoobd2sim.h

@@ -1,9 +1,9 @@
 #ifndef __NEOOBD2SIM_H_
 #define __NEOOBD2SIM_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/stm32.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
 
 namespace icsneo {
 

include/icsneo/device/neovifire/neovifire.h

@@ -1,9 +1,9 @@
 #ifndef __NEOVIFIRE_H_
 #define __NEOVIFIRE_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 

include/icsneo/device/neovifire2/neovifire2.h

@@ -1,9 +1,9 @@
 #ifndef __NEOVIFIRE2_H_
 #define __NEOVIFIRE2_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 

include/icsneo/device/neovifire2/neovifire2eth.h

@@ -1,9 +1,9 @@
 #ifndef __NEOVIFIRE2ETH_H_
 #define __NEOVIFIRE2ETH_H_
 
-#include "device/neovifire2/include/neovifire2.h"
-#include "platform/include/pcap.h"
-#include "device/neovifire2/include/neovifire2settings.h"
+#include "icsneo/device/neovifire2/neovifire2.h"
+#include "icsneo/platform/pcap.h"
+#include "icsneo/device/neovifire2/neovifire2settings.h"
 #include <memory>
 
 namespace icsneo {

include/icsneo/device/neovifire2/neovifire2settings.h

@@ -2,7 +2,7 @@
 #define __NEOVIFIRE2SETTINGS_H_
 
 #include <stdint.h>
-#include "device/include/idevicesettings.h"
+#include "icsneo/device/idevicesettings.h"
 
 #ifdef __cplusplus
 

include/icsneo/device/neovifire2/neovifire2usb.h

@@ -1,9 +1,9 @@
 #ifndef __NEOVIFIRE2USB_H_
 #define __NEOVIFIRE2USB_H_
 
-#include "device/neovifire2/include/neovifire2.h"
-#include "platform/include/ftdi.h"
-#include "device/neovifire2/include/neovifire2settings.h"
+#include "icsneo/device/neovifire2/neovifire2.h"
+#include "icsneo/platform/ftdi.h"
+#include "icsneo/device/neovifire2/neovifire2settings.h"
 
 namespace icsneo {
 

include/icsneo/device/plasion/neoviion.h

@@ -1,9 +1,9 @@
 #ifndef __NEOVIION_H_
 #define __NEOVIION_H_
 
-#include "device/plasion/include/plasion.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/plasion/plasion.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 

include/icsneo/device/plasion/neoviplasma.h

@@ -1,9 +1,9 @@
 #ifndef __NEOVIPLASMA_H_
 #define __NEOVIPLASMA_H_
 
-#include "device/plasion/include/plasion.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/plasion/plasion.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 

include/icsneo/device/plasion/plasion.h

@@ -1,9 +1,9 @@
 #ifndef __PLASION_H_
 #define __PLASION_H_
 
-#include "device/include/device.h"
-#include "communication/include/multichannelcommunication.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/device.h"
+#include "icsneo/communication/multichannelcommunication.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 

include/icsneo/device/radgalaxy/radgalaxy.h

@@ -1,11 +1,11 @@
 #ifndef __RADGALAXY_H_
 #define __RADGALAXY_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/pcap.h"
-#include "communication/include/packetizer.h"
-#include "communication/include/decoder.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/pcap.h"
+#include "icsneo/communication/packetizer.h"
+#include "icsneo/communication/decoder.h"
 
 namespace icsneo {
 

include/icsneo/device/radstar2/radstar2.h

@@ -1,8 +1,8 @@
 #ifndef __RADSTAR2_H_
 #define __RADSTAR2_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
 
 namespace icsneo {
 

include/icsneo/device/radstar2/radstar2eth.h

@@ -1,10 +1,10 @@
 #ifndef __RADSTAR2ETH_H_
 #define __RADSTAR2ETH_H_
 
-#include "device/radstar2/include/radstar2.h"
-#include "communication/include/network.h"
-#include "communication/message/include/serialnumbermessage.h"
-#include "platform/include/pcap.h"
+#include "icsneo/device/radstar2/radstar2.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/message/serialnumbermessage.h"
+#include "icsneo/platform/pcap.h"
 
 namespace icsneo {
 

include/icsneo/device/radstar2/radstar2usb.h

@@ -1,8 +1,8 @@
 #ifndef __RADSTAR2USB_H_
 #define __RADSTAR2USB_H_
 
-#include "device/radstar2/include/radstar2.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/radstar2/radstar2.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 

include/icsneo/device/radsupermoon/radsupermoon.h

@@ -1,9 +1,9 @@
 #ifndef __RADSUPERMOON_H_
 #define __RADSUPERMOON_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 

include/icsneo/device/valuecan3/valuecan3.h

@@ -1,9 +1,9 @@
 #ifndef __VALUECAN3_H_
 #define __VALUECAN3_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 

include/icsneo/device/valuecan4/settings/valuecan4-1-2settings.h

@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_1_2_SETTINGS_H_
 #define __VALUECAN4_1_2_SETTINGS_H_
 
-#include "device/include/idevicesettings.h"
-#include "device/valuecan4/settings/include/valuecan4settings.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4settings.h"
 
 #ifdef __cplusplus
 

include/icsneo/device/valuecan4/settings/valuecan4-1settings.h

@@ -1,7 +1,7 @@
 #ifndef __VALUECAN4_1_SETTINGS_H_
 #define __VALUECAN4_1_SETTINGS_H_
 
-#include "device/valuecan4/settings/include/valuecan4-1-2settings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-1-2settings.h"
 
 #ifdef __cplusplus
 

include/icsneo/device/valuecan4/settings/valuecan4-2elsettings.h

@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_2EL_SETTINGS_H_
 #define __VALUECAN4_2EL_SETTINGS_H_
 
-#include "device/include/idevicesettings.h"
-#include "device/valuecan4/settings/include/valuecan4-4-2elsettings.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-4-2elsettings.h"
 
 #ifdef __cplusplus
 

include/icsneo/device/valuecan4/settings/valuecan4-2settings.h

@@ -1,7 +1,7 @@
 #ifndef __VALUECAN4_2_SETTINGS_H_
 #define __VALUECAN4_2_SETTINGS_H_
 
-#include "device/valuecan4/settings/include/valuecan4-1-2settings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-1-2settings.h"
 
 #ifdef __cplusplus
 

include/icsneo/device/valuecan4/settings/valuecan4-4-2elsettings.h

@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_4_2EL_SETTINGS_H_
 #define __VALUECAN4_4_2EL_SETTINGS_H_
 
-#include "device/include/idevicesettings.h"
-#include "device/valuecan4/settings/include/valuecan4settings.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4settings.h"
 
 #ifdef __cplusplus
 

include/icsneo/device/valuecan4/settings/valuecan4-4settings.h

@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_4_SETTINGS_H_
 #define __VALUECAN4_4_SETTINGS_H_
 
-#include "device/include/idevicesettings.h"
-#include "device/valuecan4/settings/include/valuecan4-4-2elsettings.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-4-2elsettings.h"
 
 #ifdef __cplusplus
 

include/icsneo/device/valuecan4/settings/valuecan4settings.h

@@ -2,7 +2,7 @@
 #define __VALUECAN4_SETTINGS_H_
 
 #include <stdint.h>
-#include "device/include/idevicesettings.h"
+#include "icsneo/device/idevicesettings.h"
 
 #ifdef __cplusplus
 

include/icsneo/device/valuecan4/valuecan4-1.h

@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_1_H_
 #define __VALUECAN4_1_H_
 
-#include "device/valuecan4/include/valuecan4.h"
-#include "device/valuecan4/settings/include/valuecan4-1settings.h"
+#include "icsneo/device/valuecan4/valuecan4.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-1settings.h"
 #include <string>
 
 namespace icsneo {

include/icsneo/device/valuecan4/valuecan4-2.h

@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_2_H_
 #define __VALUECAN4_2_H_
 
-#include "device/valuecan4/include/valuecan4.h"
-#include "device/valuecan4/settings/include/valuecan4-2settings.h"
+#include "icsneo/device/valuecan4/valuecan4.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-2settings.h"
 #include <string>
 
 namespace icsneo {

include/icsneo/device/valuecan4/valuecan4-2el.h

@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_2EL_H_
 #define __VALUECAN4_2EL_H_
 
-#include "device/valuecan4/include/valuecan4.h"
-#include "device/valuecan4/settings/include/valuecan4-2elsettings.h"
+#include "icsneo/device/valuecan4/valuecan4.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-2elsettings.h"
 #include <string>
 
 namespace icsneo {

include/icsneo/device/valuecan4/valuecan4-4.h

@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_4_H_
 #define __VALUECAN4_4_H_
 
-#include "device/valuecan4/include/valuecan4.h"
-#include "device/valuecan4/settings/include/valuecan4-4settings.h"
+#include "icsneo/device/valuecan4/valuecan4.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-4settings.h"
 #include <string>
 
 namespace icsneo {

include/icsneo/device/valuecan4/valuecan4.h

@@ -1,9 +1,9 @@
 #ifndef __VALUECAN4_H_
 #define __VALUECAN4_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/stm32.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
 
 namespace icsneo {
 

include/icsneo/device/vividcan/vividcan.h

@@ -1,9 +1,9 @@
 #ifndef __VIVIDCAN_H_
 #define __VIVIDCAN_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/stm32.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
 
 namespace icsneo {
 

include/icsneo/icsneoc.h

@@ -2,9 +2,9 @@
 #define __ICSNEOC_H_
 
 #include <stddef.h>
-#include "device/include/neodevice.h" // For neodevice_t
-#include "communication/message/include/neomessage.h" // For neomessage_t and friends
-#include "platform/include/dynamiclib.h" // Dynamic library loading and exporting
+#include "icsneo/device/neodevice.h" // For neodevice_t
+#include "icsneo/communication/message/neomessage.h" // For neomessage_t and friends
+#include "icsneo/platform/dynamiclib.h" // Dynamic library loading and exporting
 
 #ifndef ICSNEOC_DYNAMICLOAD
 

include/icsneo/icsneocpp.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 
-#include "device/include/device.h"
+#include "icsneo/device/device.h"
 
 namespace icsneo {
 

include/icsneo/icsneolegacy.h

@@ -1,12 +1,12 @@
 #ifndef __ICSNEOLEGACY_H_
 #define __ICSNEOLEGACY_H_
 
-#include "platform/include/dynamiclib.h" // Dynamic library loading and exporting
-#include "platform/include/tchar.h"
+#include "icsneo/platform/dynamiclib.h" // Dynamic library loading and exporting
+#include "icsneo/platform/tchar.h"
 
 #include <stdint.h>
 typedef uint8_t byte; // Typedef helper for the following include
-#include "api/icsneolegacy/dllhelper/include/icsnVC40.h" // Definitions for structs
+#include "icsneo/icsnVC40.h" // Definitions for structs
 
 #ifdef __cplusplus
 extern "C" {

include/icsneo/platform/devices.h

@@ -2,9 +2,9 @@
 #define __DEVICES_H_
 
 #if defined _WIN32
-#include "platform/windows/include/devices.h"
+#include "icsneo/platform/windows/devices.h"
 #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include "platform/posix/include/devices.h"
+#include "icsneo/platform/posix/devices.h"
 #else
 #error "This platform is not supported by the devices driver, please add a definition!"
 #endif

include/icsneo/platform/dynamiclib.h

@@ -2,9 +2,9 @@
 #define __DYNAMICLIB_H_
 
 #if defined _WIN32
-#include "platform/windows/include/dynamiclib.h"
+#include "icsneo/platform/windows/dynamiclib.h"
 #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include "platform/posix/include/dynamiclib.h"
+#include "icsneo/platform/posix/dynamiclib.h"
 #else
 #warning "This platform is not supported by the dynamic library driver"
 #endif

include/icsneo/platform/ftdi.h

@@ -4,9 +4,9 @@
 #define INTREPID_USB_VENDOR_ID (0x093c)
 
 #if defined _WIN32
-#include "platform/windows/include/ftdi.h"
+#include "icsneo/platform/windows/ftdi.h"
 #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include "platform/posix/include/ftdi.h"
+#include "icsneo/platform/posix/ftdi.h"
 #else
 #warning "This platform is not supported by the FTDI driver"
 #endif

include/icsneo/platform/pcap.h

@@ -2,9 +2,9 @@
 #define __PCAP_H_
 
 #if defined _WIN32
-#include "platform/windows/include/pcap.h"
+#include "icsneo/platform/windows/pcap.h"
 // #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-// #include "platform/posix/include/ftdi.h"
+// #include "icsneo/platform/posix/ftdi.h"
 #else
 #warning "This platform is not supported by the PCAP driver"
 #endif

include/icsneo/platform/posix/devices.h

@@ -0,0 +1,22 @@
+#ifndef __DEVICES_POSIX_H_
+#define __DEVICES_POSIX_H_
+
+#include "icsneo/device/neoobd2pro/neoobd2pro.h"
+#include "icsneo/device/neoobd2sim/neoobd2sim.h"
+#include "icsneo/device/neovifire/neovifire.h"
+//#include "icsneo/device/neovifire2/neovifire2eth.h" Ethernet not yet supported
+#include "icsneo/device/neovifire2/neovifire2usb.h"
+#include "icsneo/device/plasion/neoviion.h"
+#include "icsneo/device/plasion/neoviplasma.h"
+//#include "icsneo/device/radgalaxy/radgalaxy.h" Ethernet not yet supported
+//#include "icsneo/device/radstar2/radstar2eth.h" Ethernet not yet supported
+#include "icsneo/device/radstar2/radstar2usb.h"
+#include "icsneo/device/radsupermoon/radsupermoon.h"
+#include "icsneo/device/valuecan3/valuecan3.h"
+#include "icsneo/device/valuecan4/valuecan4-1.h"
+#include "icsneo/device/valuecan4/valuecan4-2.h"
+#include "icsneo/device/valuecan4/valuecan4-2el.h"
+#include "icsneo/device/valuecan4/valuecan4-4.h"
+#include "icsneo/device/vividcan/vividcan.h"
+
+#endif

include/icsneo/platform/posix/dynamiclib.h

@@ -4,9 +4,9 @@
 #include <dlfcn.h>
 
 #ifdef __APPLE__
-#include "platform/posix/darwin/include/dynamiclib.h"
+#include "icsneo/platform/posix/darwin/dynamiclib.h"
 #else
-#include "platform/posix/linux/include/dynamiclib.h"
+#include "icsneo/platform/posix/linux/dynamiclib.h"
 #endif
 
 // Nothing special is needed to export

include/icsneo/platform/posix/ftdi.h

@@ -6,9 +6,9 @@
 #include <string>
 #include <atomic>
 #include <ftdi.hpp>
-#include "device/include/neodevice.h"
-#include "communication/include/icommunication.h"
-#include "third-party/concurrentqueue/blockingconcurrentqueue.h"
+#include "icsneo/device/neodevice.h"
+#include "icsneo/communication/icommunication.h"
+#include "icsneo/third-party/concurrentqueue/blockingconcurrentqueue.h"
 
 namespace icsneo {
 

include/icsneo/platform/posix/stm32.h

@@ -1,8 +1,8 @@
 #ifndef __STM32_POSIX_H_
 #define __STM32_POSIX_H_
 
-#include "communication/include/icommunication.h"
-#include "device/include/neodevice.h"
+#include "icsneo/communication/icommunication.h"
+#include "icsneo/device/neodevice.h"
 #include <chrono>
 #include <stdint.h>
 

include/icsneo/platform/registry.h

@@ -2,7 +2,7 @@
 #define __REGISTRY_H_
 
 #if defined _WIN32
-#include "platform/windows/include/registry.h"
+#include "icsneo/platform/windows/registry.h"
 #else
 #warning "This platform is not supported by the registry driver"
 #endif

include/icsneo/platform/stm32.h

@@ -4,9 +4,9 @@
 #define INTREPID_USB_VENDOR_ID (0x093c)
 
 #if defined _WIN32
-#include "platform/windows/include/stm32.h"
+#include "icsneo/platform/windows/stm32.h"
 #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include "platform/posix/include/stm32.h"
+#include "icsneo/platform/posix/stm32.h"
 #else
 #warning "This platform is not supported by the STM32 driver"
 #endif

include/icsneo/platform/tchar.h

@@ -4,7 +4,7 @@
 #if defined _WIN32
 // Windows does not need a TCHAR definition, as it is natively defined
 #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include "platform/posix/include/tchar.h"
+#include "icsneo/platform/posix/tchar.h"
 #else
 #warning "Please add a definition for this platform's equivalent to TCHAR"
 #endif

include/icsneo/platform/windows/devices.h

@@ -0,0 +1,22 @@
+#ifndef __DEVICES_WINDOWS_H_
+#define __DEVICES_WINDOWS_H_
+
+#include "icsneo/device/neoobd2pro/neoobd2pro.h"
+#include "icsneo/device/neoobd2sim/neoobd2sim.h"
+#include "icsneo/device/neovifire/neovifire.h"
+#include "icsneo/device/neovifire2/neovifire2eth.h"
+#include "icsneo/device/neovifire2/neovifire2usb.h"
+#include "icsneo/device/plasion/neoviion.h"
+#include "icsneo/device/plasion/neoviplasma.h"
+#include "icsneo/device/radgalaxy/radgalaxy.h"
+#include "icsneo/device/radstar2/radstar2eth.h"
+#include "icsneo/device/radstar2/radstar2usb.h"
+#include "icsneo/device/radsupermoon/radsupermoon.h"
+#include "icsneo/device/valuecan3/valuecan3.h"
+#include "icsneo/device/valuecan4/valuecan4-1.h"
+#include "icsneo/device/valuecan4/valuecan4-2.h"
+#include "icsneo/device/valuecan4/valuecan4-2el.h"
+#include "icsneo/device/valuecan4/valuecan4-4.h"
+#include "icsneo/device/vividcan/vividcan.h"
+
+#endif

include/icsneo/platform/windows/ftdi.h

@@ -1,7 +1,7 @@
 #ifndef __FTDI_WINDOWS_H_
 #define __FTDI_WINDOWS_H_
 
-#include "platform/windows/include/vcp.h"
+#include "icsneo/platform/windows/vcp.h"
 
 namespace icsneo {
 

include/icsneo/platform/windows/pcap.h

@@ -1,9 +1,9 @@
 #ifndef __PCAP_WINDOWS_H_
 #define __PCAP_WINDOWS_H_
 
-#include "platform/windows/internal/include/pcapdll.h"
-#include "device/include/neodevice.h"
-#include "communication/include/icommunication.h"
+#include "icsneo/platform/windows/internal/pcapdll.h"
+#include "icsneo/device/neodevice.h"
+#include "icsneo/communication/icommunication.h"
 #include <string>
 
 namespace icsneo {

include/icsneo/platform/windows/stm32.h

@@ -1,7 +1,7 @@
 #ifndef __STM32_WINDOWS_H_
 #define __STM32_WINDOWS_H_
 
-#include "platform/windows/include/vcp.h"
+#include "icsneo/platform/windows/vcp.h"
 
 namespace icsneo {
 

include/icsneo/platform/windows/vcp.h

@@ -7,8 +7,8 @@
 #include <atomic>
 #include <chrono>
 #include <Windows.h>
-#include "device/include/neodevice.h"
-#include "communication/include/icommunication.h"
+#include "icsneo/device/neodevice.h"
+#include "icsneo/communication/icommunication.h"
 
 namespace icsneo {