Linux to posix conversion

Changed "linux" target to "posix". Most of the changes are shared with
QuRT and with OSX. The Linux specific parts are in for i2c which uses
<linux/i2c.h> and <linux/i2c-dev.h>.

There is also a check for __PX4_LINUX in mavlink for a tty ioctl that is
not supported.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

109 files changed, 106 insertions, 107 deletions

diff --git a/Makefile b/Makefile
index a079e4fc4..88ce8e5de 100644
--- a/Makefile
+++ b/Makefile
@@ -100,8 +100,8 @@ endif
 ifeq ($(PX4_TARGET_OS),nuttx)
 include $(PX4_BASE)makefiles/firmware_nuttx.mk
 endif
-ifeq ($(PX4_TARGET_OS),linux)
-include $(PX4_BASE)makefiles/firmware_linux.mk
+ifeq ($(PX4_TARGET_OS),posix)
+include $(PX4_BASE)makefiles/firmware_posix.mk
 endif
 ifeq ($(PX4_TARGET_OS),qurt)
 include $(PX4_BASE)makefiles/firmware_qurt.mk
@@ -146,8 +146,8 @@ testbuild:
 	$(Q) (cd $(PX4_BASE) && $(MAKE) distclean && $(MAKE) archives && $(MAKE) -j8)
 	$(Q) (zip -r Firmware.zip $(PX4_BASE)/Images)
 
-linuxrun:
-	Tools/linux_run.sh
+posixrun:
+	Tools/posix_run.sh
 
 #
 # Unittest targets. Builds and runs the host-level
diff --git a/Tools/linux_apps.py b/Tools/posix_apps.py
index f48977c49..f48977c49 100755
--- a/Tools/linux_apps.py
+++ b/Tools/posix_apps.py
diff --git a/Tools/linux_run.sh b/Tools/posix_run.sh
index ebe7a7774..ebe7a7774 100755
--- a/Tools/linux_run.sh
+++ b/Tools/posix_run.sh
diff --git a/makefiles/README.txt b/makefiles/README.txt
index 36edf6a47..957879395 100644
--- a/makefiles/README.txt
+++ b/makefiles/README.txt
@@ -30,9 +30,9 @@ firmware_nuttx.mk
 
 	Called by firmware.mk to build NuttX based firmware.
 
-firmware_linux.mk
+firmware_posix.mk
 
-	Called by firmware.mk to build Linux (non-ROS) based firmware.
+	Called by firmware.mk to build POSIX (non-ROS) based firmware.
 
 module.mk
 
@@ -46,10 +46,10 @@ nuttx.mk
 	Called by ../Makefile to build or download the NuttX archives if 
 	PX4_TARGET_OS is set to "nuttx".
 
-linux.mk
+posix.mk
 
-	Called by ../Makefile to set Linux specific parameters if 
-	PX4_TARGET_OS is set to "linux".
+	Called by ../Makefile to set POSIX specific parameters if 
+	PX4_TARGET_OS is set to "posix".
 
 upload.mk
 
diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk
index 5f5447da6..b58f23cbc 100644
--- a/makefiles/firmware.mk
+++ b/makefiles/firmware.mk
@@ -360,8 +360,8 @@ $(filter %.S.o,$(OBJS)): $(WORK_DIR)%.S.o: %.S $(GLOBAL_DEPS)
 ifeq ($(PX4_TARGET_OS),nuttx)
 include $(MK_DIR)/nuttx_romfs.mk
 endif
-ifeq ($(PX4_TARGET_OS),linux)
-include $(MK_DIR)/linux_elf.mk
+ifeq ($(PX4_TARGET_OS),posix)
+include $(MK_DIR)/posix_elf.mk
 endif
 ifeq ($(PX4_TARGET_OS),qurt)
 include $(MK_DIR)/qurt_elf.mk
diff --git a/makefiles/firmware_linux.mk b/makefiles/firmware_posix.mk
index 6acec4e73..6acec4e73 100644
--- a/makefiles/firmware_linux.mk
+++ b/makefiles/firmware_posix.mk
diff --git a/makefiles/board_px4-stm32f4discovery.mk b/makefiles/nuttx/board_px4-stm32f4discovery.mk
index fe761ba44..fe761ba44 100644
--- a/makefiles/board_px4-stm32f4discovery.mk
+++ b/makefiles/nuttx/board_px4-stm32f4discovery.mk
diff --git a/makefiles/config_px4-stm32f4discovery_default.mk b/makefiles/nuttx/config_px4-stm32f4discovery_default.mk
index 8f73a7f04..8f73a7f04 100644
--- a/makefiles/config_px4-stm32f4discovery_default.mk
+++ b/makefiles/nuttx/config_px4-stm32f4discovery_default.mk
diff --git a/makefiles/gumstix-aerocore.cfg b/makefiles/nuttx/gumstix-aerocore.cfg
index ba217c043..ba217c043 100644
--- a/makefiles/gumstix-aerocore.cfg
+++ b/makefiles/nuttx/gumstix-aerocore.cfg
diff --git a/makefiles/linux.mk b/makefiles/posix.mk
index d050259c5..13cb97f0d 100644
--- a/makefiles/linux.mk
+++ b/makefiles/posix.mk
@@ -36,5 +36,5 @@
 
 MODULES += \
 		platforms/common \
-		platforms/linux/px4_layer 
+		platforms/posix/px4_layer 
 
diff --git a/makefiles/linux/board_linux.mk b/makefiles/posix/board_posix.mk
index cf5d42ff4..93146b6a2 100644
--- a/makefiles/linux/board_linux.mk
+++ b/makefiles/posix/board_posix.mk
@@ -1,11 +1,11 @@
 #
-# Board-specific definitions for the Linux port of PX4
+# Board-specific definitions for the POSIX port of PX4
 #
 
 #
 # Configure the toolchain
 #
 CONFIG_ARCH			 = NATIVE
-CONFIG_BOARD			 = LINUXTEST
+CONFIG_BOARD			 = POSIXTEST
 
 include $(PX4_MK_DIR)/toolchain_native.mk
diff --git a/makefiles/linux/config_linux_default.mk b/makefiles/posix/config_posix_default.mk
index 5dfd487e7..53b315346 100644
--- a/makefiles/linux/config_linux_default.mk
+++ b/makefiles/posix/config_posix_default.mk
@@ -1,13 +1,8 @@
 #
-# Makefile for the Foo *default* configuration
+# Makefile for the POSIXTEST *default* configuration
 #
 
 #
-# Use the configuration's ROMFS.
-#
-#ROMFS_ROOT	 = $(PX4_BASE)/ROMFS/px4fmu_common
-
-#
 # Board support modules
 #
 MODULES		+= drivers/device
@@ -61,17 +56,17 @@ MODULES		+= lib/conversion
 #
 # Linux port
 #
-MODULES		+= platforms/linux/px4_layer
-MODULES		+= platforms/linux/drivers/accelsim
-MODULES		+= platforms/linux/drivers/gyrosim
-MODULES		+= platforms/linux/drivers/adcsim
-MODULES		+= platforms/linux/drivers/barosim
+MODULES		+= platforms/posix/px4_layer
+MODULES		+= platforms/posix/drivers/accelsim
+MODULES		+= platforms/posix/drivers/gyrosim
+MODULES		+= platforms/posix/drivers/adcsim
+MODULES		+= platforms/posix/drivers/barosim
 
 #
 # Unit tests
 #
-#MODULES		+= platforms/linux/tests/hello
-#MODULES		+= platforms/linux/tests/vcdev_test
-#MODULES		+= platforms/linux/tests/hrt_test
-#MODULES		+= platforms/linux/tests/wqueue
+#MODULES		+= platforms/posix/tests/hello
+#MODULES		+= platforms/posix/tests/vcdev_test
+#MODULES		+= platforms/posix/tests/hrt_test
+#MODULES		+= platforms/posix/tests/wqueue
 
diff --git a/makefiles/linux_elf.mk b/makefiles/posix_elf.mk
index 701d731ef..edb1e32d7 100644
--- a/makefiles/linux_elf.mk
+++ b/makefiles/posix_elf.mk
@@ -30,7 +30,7 @@
 #
 
 #
-# Makefile for PX4 Linux based firmware images.
+# Makefile for PX4 POSIX based firmware images.
 #
 
 ################################################################################
@@ -56,9 +56,9 @@ $(PRODUCT_SHARED_PRELINK):	$(OBJS) $(MODULE_OBJS) $(LIBRARY_LIBS) $(GLOBAL_DEPS)
 $(PRODUCT_SHARED_LIB):		$(PRODUCT_SHARED_PRELINK)
 	$(call LINK_A,$@,$(PRODUCT_SHARED_PRELINK))
 
-MAIN = $(PX4_BASE)/src/platforms/linux/main.cpp
+MAIN = $(PX4_BASE)/src/platforms/posix/main.cpp
 $(WORK_DIR)mainapp: $(PRODUCT_SHARED_LIB)
-	$(PX4_BASE)/Tools/linux_apps.py > apps.h
+	$(PX4_BASE)/Tools/posix_apps.py > apps.h
 	$(call LINK,$@, -I. $(MAIN) $(PRODUCT_SHARED_LIB))
 
 #
diff --git a/makefiles/setup.mk b/makefiles/setup.mk
index 646846b25..0cdaa1e83 100644
--- a/makefiles/setup.mk
+++ b/makefiles/setup.mk
@@ -35,9 +35,9 @@
 
 export PX4_TARGET_OS 	 ?= nuttx
 
-# PX4_TARGET_OS	can be nuttx, linux, or qurt
+# PX4_TARGET_OS	can be nuttx, posix, or qurt
 ifeq ($(PX4_TARGET_OS),)
-$(error Use: make PX4_TARGET_OS=<target> where <target> is nuttx, linux, or qurt)
+$(error Use: make PX4_TARGET_OS=<target> where <target> is nuttx, posix, or qurt)
 endif
 
 #
diff --git a/makefiles/toolchain_hexagon.mk b/makefiles/toolchain_hexagon.mk
index dacb60bfb..aab9fada1 100644
--- a/makefiles/toolchain_hexagon.mk
+++ b/makefiles/toolchain_hexagon.mk
@@ -181,7 +181,7 @@ AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__ \
 			   $(EXTRADEFINES) \
 			   $(EXTRAAFLAGS)
 
-LDSCRIPT		 = $(PX4_BASE)/linux-configs/linuxtest/scripts/ld.script
+LDSCRIPT		 = $(PX4_BASE)/posix-configs/posixtest/scripts/ld.script
 # Flags we pass to the linker
 #
 LDFLAGS			+=  \
diff --git a/makefiles/toolchain_native.mk b/makefiles/toolchain_native.mk
index cd3bbeaff..763b25ce8 100644
--- a/makefiles/toolchain_native.mk
+++ b/makefiles/toolchain_native.mk
@@ -1,7 +1,7 @@
 #
 #   Copyright (C) 2012-2014 PX4 Development Team. All rights reuint32_tserved.
 #
-#   2005 Modified for clang and GCC on Linux:
+#   2005 Modified for clang and GCC on POSIX:
 #        Author: Mark Charlebois <charlebm@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -120,10 +120,10 @@ ifeq ($(CONFIG_BOARD),)
 $(error Board config does not define CONFIG_BOARD)
 endif
 ARCHDEFINES		+= -DCONFIG_ARCH_BOARD_$(CONFIG_BOARD) \
-			-D__PX4_LINUX \
+			-D__PX4_LINUX -D__PX4_POSIX \
 			-Dnoreturn_function= \
 			-I$(PX4_BASE)/src/lib/eigen \
-			-I$(PX4_BASE)/src/platforms/linux/include \
+			-I$(PX4_BASE)/src/platforms/posix/include \
 			-Wno-error=shadow
 
 # optimisation flags
@@ -250,7 +250,7 @@ AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__ \
 			   $(EXTRADEFINES) \
 			   $(EXTRAAFLAGS)
 
-LDSCRIPT		 = $(PX4_BASE)/linux-configs/linuxtest/scripts/ld.script
+LDSCRIPT		 = $(PX4_BASE)/posix-configs/posixtest/scripts/ld.script
 # Flags we pass to the linker
 #
 LDFLAGS			+= $(EXTRALDFLAGS) \
diff --git a/makefiles/upload.mk b/makefiles/upload.mk
index dd7710bf7..c590f17d1 100644
--- a/makefiles/upload.mk
+++ b/makefiles/upload.mk
@@ -31,7 +31,7 @@ upload-serial-px4fmu-v2:	$(BUNDLE) $(UPLOADER)
 	$(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE)
 
 upload-serial-aerocore:
-	openocd -f $(PX4_BASE)/makefiles/gumstix-aerocore.cfg -c 'init; reset halt; flash write_image erase $(PX4_BASE)/../Bootloader/px4aerocore_bl.bin 0x08000000; flash write_image erase $(PX4_BASE)/Build/aerocore_default.build/firmware.bin 0x08004000; reset run; exit'
+	openocd -f $(PX4_BASE)/makefiles/nuttx/gumstix-aerocore.cfg -c 'init; reset halt; flash write_image erase $(PX4_BASE)/../Bootloader/px4aerocore_bl.bin 0x08000000; flash write_image erase $(PX4_BASE)/Build/aerocore_default.build/firmware.bin 0x08004000; reset run; exit'
 
 upload-serial-px4-stm32f4discovery:	$(BUNDLE) $(UPLOADER)
 	$(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE)
diff --git a/linux-configs/linuxtest/init/rc.S b/posix-configs/posixtest/init/rc.S
index f10f57ec3..f10f57ec3 100644
--- a/linux-configs/linuxtest/init/rc.S
+++ b/posix-configs/posixtest/init/rc.S
diff --git a/linux-configs/linuxtest/scripts/ld.script b/posix-configs/posixtest/scripts/ld.script
index 32478e1e1..32478e1e1 100644
--- a/linux-configs/linuxtest/scripts/ld.script
+++ b/posix-configs/posixtest/scripts/ld.script
diff --git a/src/drivers/blinkm/blinkm_linux.cpp b/src/drivers/blinkm/blinkm_posix.cpp
index 5a139a710..5a139a710 100644
--- a/src/drivers/blinkm/blinkm_linux.cpp
+++ b/src/drivers/blinkm/blinkm_posix.cpp
diff --git a/src/drivers/blinkm/module.mk b/src/drivers/blinkm/module.mk
index 712f26631..1547a17e9 100644
--- a/src/drivers/blinkm/module.mk
+++ b/src/drivers/blinkm/module.mk
@@ -40,7 +40,7 @@ MODULE_COMMAND	= blinkm
 ifeq ($(PX4_TARGET_OS),nuttx)
 SRCS		= blinkm_nuttx.cpp
 else
-SRCS		= blinkm_linux.cpp
+SRCS		= blinkm_posix.cpp
 endif
 
 MAXOPTIMIZATION	 = -Os
diff --git a/src/drivers/device/device.h b/src/drivers/device/device.h
index 4d941b752..e145635b3 100644
--- a/src/drivers/device/device.h
+++ b/src/drivers/device/device.h
@@ -35,7 +35,7 @@
 
 #ifdef __PX4_NUTTX
 #include "device_nuttx.h"
-#elif defined (__PX4_LINUX)
+#elif defined (__PX4_POSIX)
 #include "vdev.h"
 #endif
 
diff --git a/src/drivers/device/i2c.h b/src/drivers/device/i2c.h
index fb0be9bd5..e6a4dffc8 100644
--- a/src/drivers/device/i2c.h
+++ b/src/drivers/device/i2c.h
@@ -35,5 +35,5 @@
 #ifdef __PX4_NUTTX
 #include "i2c_nuttx.h"
 #else
-#include "i2c_linux.h"
+#include "i2c_posix.h"
 #endif
diff --git a/src/drivers/device/i2c_linux.cpp b/src/drivers/device/i2c_posix.cpp
index 2de830a52..51e8e2083 100644
--- a/src/drivers/device/i2c_linux.cpp
+++ b/src/drivers/device/i2c_posix.cpp
@@ -41,8 +41,10 @@
  */
 
 #include "i2c.h"
+#ifdef __PX4_LINUX
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
+#endif
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/src/drivers/device/i2c_linux.h b/src/drivers/device/i2c_posix.h
index c0a94aff0..e01e3c242 100644
--- a/src/drivers/device/i2c_linux.h
+++ b/src/drivers/device/i2c_posix.h
@@ -43,8 +43,10 @@
 #include "vdev.h"
 
 #include <px4_i2c.h>
+#ifdef __PX4_LINUX
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
+#endif
 #include <string>
 
 namespace device __EXPORT
diff --git a/src/drivers/device/module.mk b/src/drivers/device/module.mk
index 4e0b563e5..85826bbc4 100644
--- a/src/drivers/device/module.mk
+++ b/src/drivers/device/module.mk
@@ -44,11 +44,11 @@ SRCS =		  \
 		  spi.cpp \
 		  ringbuffer.cpp
 endif
-ifeq ($(PX4_TARGET_OS),linux)
+ifeq ($(PX4_TARGET_OS),posix)
 SRCS =		  vdev.cpp \
 		  device.cpp \
 		  vdev_posix.cpp \
-		  i2c_linux.cpp  \
+		  i2c_posix.cpp  \
 		  sim.cpp \
 		  ringbuffer.cpp
 endif
diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h
index c023ae742..a0faab809 100644
--- a/src/drivers/drv_gpio.h
+++ b/src/drivers/drv_gpio.h
@@ -114,14 +114,14 @@
 /* no GPIO driver on the PX4_STM32F4DISCOVERY board */
 #endif
 
-#ifdef CONFIG_ARCH_BOARD_LINUXTEST
-/* no GPIO driver on the LINUXTEST board */
+#ifdef CONFIG_ARCH_BOARD_POSIXTEST
+/* no GPIO driver on the POSIXTEST board */
 #endif
 
 #if !defined(CONFIG_ARCH_BOARD_PX4IO_V1) && !defined(CONFIG_ARCH_BOARD_PX4IO_V2)  && \
 	!defined(CONFIG_ARCH_BOARD_PX4FMU_V1) && !defined(CONFIG_ARCH_BOARD_PX4FMU_V2) && \
 	!defined(CONFIG_ARCH_BOARD_AEROCORE) && !defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) && \
-	!defined(CONFIG_ARCH_BOARD_LINUXTEST)
+	!defined(CONFIG_ARCH_BOARD_POSIXTEST)
 # error No CONFIG_ARCH_BOARD_xxxx set
 #endif
 /*
diff --git a/src/drivers/hil/hil_linux.cpp b/src/drivers/hil/hil_posix.cpp
index eca2ec8ba..eca2ec8ba 100644
--- a/src/drivers/hil/hil_linux.cpp
+++ b/src/drivers/hil/hil_posix.cpp
diff --git a/src/drivers/hil/module.mk b/src/drivers/hil/module.mk
index 0fe193e5c..b168108b3 100644
--- a/src/drivers/hil/module.mk
+++ b/src/drivers/hil/module.mk
@@ -41,6 +41,6 @@ ifeq ($(PX4_TARGET_OS),nuttx)
 SRCS		= hil.cpp
 MAXOPTIMIZATION	 = -Os
 else
-SRCS		= hil_linux.cpp
+SRCS		= hil_posix.cpp
 endif
 
diff --git a/src/drivers/ms5611/module.mk b/src/drivers/ms5611/module.mk
index 59316f4bf..7ff49d735 100644
--- a/src/drivers/ms5611/module.mk
+++ b/src/drivers/ms5611/module.mk
@@ -40,7 +40,7 @@ MODULE_COMMAND	= ms5611
 ifeq ($(PX4_TARGET_OS),nuttx)
 SRCS		= ms5611_nuttx.cpp ms5611_spi.cpp ms5611_i2c.cpp
 else
-SRCS		= ms5611_linux.cpp ms5611_spi.cpp ms5611_i2c.cpp ms5611_sim.cpp
+SRCS		= ms5611_posix.cpp ms5611_spi.cpp ms5611_i2c.cpp ms5611_sim.cpp
 endif
 
 MAXOPTIMIZATION	 = -Os
diff --git a/src/drivers/ms5611/ms5611_linux.cpp b/src/drivers/ms5611/ms5611_posix.cpp
index 9e99d926e..9e99d926e 100644
--- a/src/drivers/ms5611/ms5611_linux.cpp
+++ b/src/drivers/ms5611/ms5611_posix.cpp
diff --git a/src/drivers/rgbled/module.mk b/src/drivers/rgbled/module.mk
index a96480b38..f75625007 100644
--- a/src/drivers/rgbled/module.mk
+++ b/src/drivers/rgbled/module.mk
@@ -7,7 +7,7 @@ MODULE_COMMAND	 = rgbled
 ifeq ($(PX4_TARGET_OS),nuttx)
 SRCS		 = rgbled.cpp
 else
-SRCS		 = rgbled_linux.cpp
+SRCS		 = rgbled_posix.cpp
 endif
 
 MAXOPTIMIZATION	 = -Os
diff --git a/src/drivers/rgbled/rgbled_linux.cpp b/src/drivers/rgbled/rgbled_posix.cpp
index 4344b6792..4344b6792 100644
--- a/src/drivers/rgbled/rgbled_linux.cpp
+++ b/src/drivers/rgbled/rgbled_posix.cpp
diff --git a/src/lib/mathlib/math/Limits.cpp b/src/lib/mathlib/math/Limits.cpp
index dffa213e0..4b1273c7a 100644
--- a/src/lib/mathlib/math/Limits.cpp
+++ b/src/lib/mathlib/math/Limits.cpp
@@ -47,7 +47,7 @@
 namespace math
 {
 
-#if !defined(CONFIG_ARCH_ARM) && !defined(__PX4_LINUX)
+#if !defined(CONFIG_ARCH_ARM) && !defined(__PX4_POSIX)
 #define M_PI_F 3.14159265358979323846f
 #endif
 
diff --git a/src/lib/version/version.h b/src/lib/version/version.h
index f0071f3b5..ddf13822d 100644
--- a/src/lib/version/version.h
+++ b/src/lib/version/version.h
@@ -59,7 +59,7 @@
 #define HW_ARCH "PX4_STM32F4DISCOVERY"
 #endif
 
-#ifdef CONFIG_ARCH_BOARD_LINUXTEST
+#ifdef CONFIG_ARCH_BOARD_POSIXTEST
 #define	HW_ARCH "LINUXTEST"
 #endif
 #endif /* VERSION_H_ */
diff --git a/src/modules/commander/module.mk b/src/modules/commander/module.mk
index 5fb11ca16..851ac9020 100644
--- a/src/modules/commander/module.mk
+++ b/src/modules/commander/module.mk
@@ -52,7 +52,7 @@ ifdef ($(PX4_TARGET_OS),nuttx)
 SRCS += 
 			state_machine_helper.cpp 
 else
-SRCS +=			state_machine_helper_linux.cpp 
+SRCS +=			state_machine_helper_posix.cpp 
 endif
 
 MODULE_STACKSIZE = 5000
diff --git a/src/modules/commander/state_machine_helper_linux.cpp b/src/modules/commander/state_machine_helper_posix.cpp
index 97c2f1104..97c2f1104 100644
--- a/src/modules/commander/state_machine_helper_linux.cpp
+++ b/src/modules/commander/state_machine_helper_posix.cpp
diff --git a/src/modules/mavlink/mavlink_ftp_linux.cpp b/src/modules/mavlink/mavlink_ftp_posix.cpp
index 1ff7dce73..1ff7dce73 100644
--- a/src/modules/mavlink/mavlink_ftp_linux.cpp
+++ b/src/modules/mavlink/mavlink_ftp_posix.cpp
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h
index 3153255b3..9b00d72c0 100644
--- a/src/modules/mavlink/mavlink_main.h
+++ b/src/modules/mavlink/mavlink_main.h
@@ -35,5 +35,5 @@
 #ifdef __PX4_NUTTX
 #include "mavlink_main_nuttx.h"
 #else
-#include "mavlink_main_linux.h"
+#include "mavlink_main_posix.h"
 #endif
diff --git a/src/modules/mavlink/mavlink_main_linux.cpp b/src/modules/mavlink/mavlink_main_posix.cpp
index 784118916..784118916 100644
--- a/src/modules/mavlink/mavlink_main_linux.cpp
+++ b/src/modules/mavlink/mavlink_main_posix.cpp
diff --git a/src/modules/mavlink/mavlink_main_linux.h b/src/modules/mavlink/mavlink_main_posix.h
index 1edb5c720..67f2c8aa6 100644
--- a/src/modules/mavlink/mavlink_main_linux.h
+++ b/src/modules/mavlink/mavlink_main_posix.h
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /**
- * @file mavlink_main_linux.h
+ * @file mavlink_main_posix.h
  * MAVLink 1.0 protocol interface definition.
  *
  * @author Lorenz Meier <lm@inf.ethz.ch>
diff --git a/src/modules/mavlink/mavlink_receiver_nuttx.cpp b/src/modules/mavlink/mavlink_receiver_nuttx.cpp
index 81c76ef3f..faede15cb 100644
--- a/src/modules/mavlink/mavlink_receiver_nuttx.cpp
+++ b/src/modules/mavlink/mavlink_receiver_nuttx.cpp
@@ -41,7 +41,7 @@
  */
 
 /* XXX trim includes */
-#include <px4_config.h>
+#include <nuttx/config.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <stdio.h>
diff --git a/src/modules/mavlink/mavlink_receiver_linux.cpp b/src/modules/mavlink/mavlink_receiver_posix.cpp
index bfe7a4552..bfe7a4552 100644
--- a/src/modules/mavlink/mavlink_receiver_linux.cpp
+++ b/src/modules/mavlink/mavlink_receiver_posix.cpp
diff --git a/src/modules/mavlink/mavlink_tests/module.mk b/src/modules/mavlink/mavlink_tests/module.mk
index 030706cc4..bc5267741 100644
--- a/src/modules/mavlink/mavlink_tests/module.mk
+++ b/src/modules/mavlink/mavlink_tests/module.mk
@@ -42,7 +42,7 @@ SRCS			= mavlink_tests.cpp \
 ifeq ($(PX4_TARGET_NUTTX),nuttx)
 SRCS += 		../mavlink_ftp_nuttx.cpp 
 else
-SRCS += 		../mavlink_ftp_linux.cpp 
+SRCS += 		../mavlink_ftp_posix.cpp 
 endif
 
 INCLUDE_DIRS	 += $(MAVLINK_SRC)/include/mavlink
diff --git a/src/modules/mavlink/module.mk b/src/modules/mavlink/module.mk
index 1740c6b77..20bf945b1 100644
--- a/src/modules/mavlink/module.mk
+++ b/src/modules/mavlink/module.mk
@@ -41,9 +41,9 @@ SRCS		 += 	mavlink_main_nuttx.cpp \
 			mavlink_ftp_nuttx.cpp \
 			mavlink_receiver_nuttx.cpp 
 else
-SRCS		 += 	mavlink_main_linux.cpp \
-			mavlink_ftp_linux.cpp \
-			mavlink_receiver_linux.cpp 
+SRCS		 += 	mavlink_main_posix.cpp \
+			mavlink_ftp_posix.cpp \
+			mavlink_receiver_posix.cpp 
 endif
 
 SRCS 		 +=	mavlink.c \
diff --git a/src/modules/sensors/module.mk b/src/modules/sensors/module.mk
index d49f6fdfb..7237600ff 100644
--- a/src/modules/sensors/module.mk
+++ b/src/modules/sensors/module.mk
@@ -41,7 +41,7 @@ MODULE_PRIORITY	= "SCHED_PRIORITY_MAX-5"
 ifeq ($(PX$_TARGET_OS),nuttx)
 SRCS		= sensors_nuttx.cpp 
 else
-SRCS		= sensors_linux.cpp 
+SRCS		= sensors_posix.cpp 
 endif
 SRCS +=		  sensor_params.c
 
diff --git a/src/modules/sensors/sensors_nuttx.cpp b/src/modules/sensors/sensors_nuttx.cpp
index 86041165b..3fc8627c1 100644
--- a/src/modules/sensors/sensors_nuttx.cpp
+++ b/src/modules/sensors/sensors_nuttx.cpp
@@ -46,7 +46,7 @@
  * @author Anton Babushkin <anton@px4.io>
  */
 
-#include <px4_config.h>
+#include <nuttx/config.h>
 
 #include <fcntl.h>
 #include <poll.h>
diff --git a/src/modules/sensors/sensors_linux.cpp b/src/modules/sensors/sensors_posix.cpp
index 01a0c0dee..01a0c0dee 100644
--- a/src/modules/sensors/sensors_linux.cpp
+++ b/src/modules/sensors/sensors_posix.cpp
diff --git a/src/modules/systemlib/param/param.h b/src/modules/systemlib/param/param.h
index 8f53a5d73..da810abea 100644
--- a/src/modules/systemlib/param/param.h
+++ b/src/modules/systemlib/param/param.h
@@ -396,7 +396,7 @@ struct param_info_s {
 // See https://llvm.org/bugs/show_bug.cgi?format=multiple&id=18006
 // The following hack is for GCC >=4.8 only. Clang works fine without
 // this.
-#ifdef __PX4_LINUX
+#ifdef __PX4_POSIX
 				__attribute__((aligned(16)));
 #else
 				;
diff --git a/src/platforms/linux/drivers/accelsim/accelsim.cpp b/src/platforms/posix/drivers/accelsim/accelsim.cpp
index 97314ab84..97314ab84 100644
--- a/src/platforms/linux/drivers/accelsim/accelsim.cpp
+++ b/src/platforms/posix/drivers/accelsim/accelsim.cpp
diff --git a/src/platforms/linux/drivers/accelsim/module.mk b/src/platforms/posix/drivers/accelsim/module.mk
index dc980c5cc..dc980c5cc 100644
--- a/src/platforms/linux/drivers/accelsim/module.mk
+++ b/src/platforms/posix/drivers/accelsim/module.mk
diff --git a/src/platforms/linux/drivers/adcsim/adcsim.cpp b/src/platforms/posix/drivers/adcsim/adcsim.cpp
index 78ffbf1db..78ffbf1db 100644
--- a/src/platforms/linux/drivers/adcsim/adcsim.cpp
+++ b/src/platforms/posix/drivers/adcsim/adcsim.cpp
diff --git a/src/platforms/linux/drivers/adcsim/module.mk b/src/platforms/posix/drivers/adcsim/module.mk
index a8ad55eff..a8ad55eff 100644
--- a/src/platforms/linux/drivers/adcsim/module.mk
+++ b/src/platforms/posix/drivers/adcsim/module.mk
diff --git a/src/platforms/linux/drivers/barosim/baro.cpp b/src/platforms/posix/drivers/barosim/baro.cpp
index 8398d18c5..8398d18c5 100644
--- a/src/platforms/linux/drivers/barosim/baro.cpp
+++ b/src/platforms/posix/drivers/barosim/baro.cpp
diff --git a/src/platforms/linux/drivers/barosim/baro_sim.cpp b/src/platforms/posix/drivers/barosim/baro_sim.cpp
index 2e628f571..2e628f571 100644
--- a/src/platforms/linux/drivers/barosim/baro_sim.cpp
+++ b/src/platforms/posix/drivers/barosim/baro_sim.cpp
diff --git a/src/platforms/linux/drivers/barosim/barosim.h b/src/platforms/posix/drivers/barosim/barosim.h
index 8eaa0c21f..8eaa0c21f 100644
--- a/src/platforms/linux/drivers/barosim/barosim.h
+++ b/src/platforms/posix/drivers/barosim/barosim.h
diff --git a/src/platforms/linux/drivers/barosim/module.mk b/src/platforms/posix/drivers/barosim/module.mk
index 5a4cb4ebb..5a4cb4ebb 100644
--- a/src/platforms/linux/drivers/barosim/module.mk
+++ b/src/platforms/posix/drivers/barosim/module.mk
diff --git a/src/platforms/linux/drivers/gyrosim/gyrosim.cpp b/src/platforms/posix/drivers/gyrosim/gyrosim.cpp
index c39ebeac0..c39ebeac0 100644
--- a/src/platforms/linux/drivers/gyrosim/gyrosim.cpp
+++ b/src/platforms/posix/drivers/gyrosim/gyrosim.cpp
diff --git a/src/platforms/linux/drivers/gyrosim/module.mk b/src/platforms/posix/drivers/gyrosim/module.mk
index 7bd37c2e2..7bd37c2e2 100644
--- a/src/platforms/linux/drivers/gyrosim/module.mk
+++ b/src/platforms/posix/drivers/gyrosim/module.mk
diff --git a/src/platforms/linux/include/arch/board/board.h b/src/platforms/posix/include/arch/board/board.h
index e69de29bb..e69de29bb 100644
--- a/src/platforms/linux/include/arch/board/board.h
+++ b/src/platforms/posix/include/arch/board/board.h
diff --git a/src/platforms/linux/include/board_config.h b/src/platforms/posix/include/board_config.h
index a03b8c3e2..a03b8c3e2 100644
--- a/src/platforms/linux/include/board_config.h
+++ b/src/platforms/posix/include/board_config.h
diff --git a/src/platforms/linux/include/crc32.h b/src/platforms/posix/include/crc32.h
index bf828e3e0..bf828e3e0 100644
--- a/src/platforms/linux/include/crc32.h
+++ b/src/platforms/posix/include/crc32.h
diff --git a/src/platforms/linux/include/queue.h b/src/platforms/posix/include/queue.h
index 4d95541e0..4d95541e0 100644
--- a/src/platforms/linux/include/queue.h
+++ b/src/platforms/posix/include/queue.h
diff --git a/src/platforms/linux/main.cpp b/src/platforms/posix/main.cpp
index 8ae5ee58d..8ae5ee58d 100644
--- a/src/platforms/linux/main.cpp
+++ b/src/platforms/posix/main.cpp
diff --git a/src/platforms/linux/px4_layer/dq_addlast.c b/src/platforms/posix/px4_layer/dq_addlast.c
index 3ef08abd0..3ef08abd0 100644
--- a/src/platforms/linux/px4_layer/dq_addlast.c
+++ b/src/platforms/posix/px4_layer/dq_addlast.c
diff --git a/src/platforms/linux/px4_layer/dq_rem.c b/src/platforms/posix/px4_layer/dq_rem.c
index db20762c7..db20762c7 100644
--- a/src/platforms/linux/px4_layer/dq_rem.c
+++ b/src/platforms/posix/px4_layer/dq_rem.c
diff --git a/src/platforms/linux/px4_layer/dq_remfirst.c b/src/platforms/posix/px4_layer/dq_remfirst.c
index e87acc338..e87acc338 100644
--- a/src/platforms/linux/px4_layer/dq_remfirst.c
+++ b/src/platforms/posix/px4_layer/dq_remfirst.c
diff --git a/src/platforms/linux/px4_layer/drv_hrt.c b/src/platforms/posix/px4_layer/drv_hrt.c
index 066abe70d..066abe70d 100644
--- a/src/platforms/linux/px4_layer/drv_hrt.c
+++ b/src/platforms/posix/px4_layer/drv_hrt.c
diff --git a/src/platforms/linux/px4_layer/lib_crc32.c b/src/platforms/posix/px4_layer/lib_crc32.c
index 4ba6fbf6d..4ba6fbf6d 100644
--- a/src/platforms/linux/px4_layer/lib_crc32.c
+++ b/src/platforms/posix/px4_layer/lib_crc32.c
diff --git a/src/platforms/linux/px4_layer/module.mk b/src/platforms/posix/px4_layer/module.mk
index de6678eb9..2df90461d 100644
--- a/src/platforms/linux/px4_layer/module.mk
+++ b/src/platforms/posix/px4_layer/module.mk
@@ -36,8 +36,8 @@
 #
 
 SRCS		 = 	\
-			px4_linux_impl.cpp \
-			px4_linux_tasks.cpp  \
+			px4_posix_impl.cpp \
+			px4_posix_tasks.cpp  \
 			work_thread.c \
 			work_queue.c \
 			work_cancel.c \
diff --git a/src/platforms/linux/px4_layer/px4_linux_impl.cpp b/src/platforms/posix/px4_layer/px4_posix_impl.cpp
index 973b85abd..3b1415fd7 100644
--- a/src/platforms/linux/px4_layer/px4_linux_impl.cpp
+++ b/src/platforms/posix/px4_layer/px4_posix_impl.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /**
- * @file px4_linux_impl.cpp
+ * @file px4_posix_impl.cpp
  *
  * PX4 Middleware Wrapper Linux Implementation
  */
diff --git a/src/platforms/linux/px4_layer/px4_linux_tasks.cpp b/src/platforms/posix/px4_layer/px4_posix_tasks.cpp
index a210f430e..fd5863727 100644
--- a/src/platforms/linux/px4_layer/px4_linux_tasks.cpp
+++ b/src/platforms/posix/px4_layer/px4_posix_tasks.cpp
@@ -33,7 +33,7 @@
  ****************************************************************************/
 
 /**
- * @file px4_linux_tasks.c
+ * @file px4_posix_tasks.c
  * Implementation of existing task API for Linux
  */
 
diff --git a/src/platforms/linux/px4_layer/queue.c b/src/platforms/posix/px4_layer/queue.c
index 2543782b8..826cc2d16 100644
--- a/src/platforms/linux/px4_layer/queue.c
+++ b/src/platforms/posix/px4_layer/queue.c
@@ -35,7 +35,7 @@
  ************************************************************************/
 
 // FIXME - need px4_queue
-#include <platforms/linux/include/queue.h>
+#include <platforms/posix/include/queue.h>
 #include <stddef.h>
 
 __EXPORT void sq_rem(sq_entry_t *node, sq_queue_t *queue);
diff --git a/src/platforms/linux/px4_layer/sq_addafter.c b/src/platforms/posix/px4_layer/sq_addafter.c
index 5d47feba0..5d47feba0 100644
--- a/src/platforms/linux/px4_layer/sq_addafter.c
+++ b/src/platforms/posix/px4_layer/sq_addafter.c
diff --git a/src/platforms/linux/px4_layer/sq_addlast.c b/src/platforms/posix/px4_layer/sq_addlast.c
index faa07efb5..faa07efb5 100644
--- a/src/platforms/linux/px4_layer/sq_addlast.c
+++ b/src/platforms/posix/px4_layer/sq_addlast.c
diff --git a/src/platforms/linux/px4_layer/sq_remfirst.c b/src/platforms/posix/px4_layer/sq_remfirst.c
index f81c18dc2..f81c18dc2 100644
--- a/src/platforms/linux/px4_layer/sq_remfirst.c
+++ b/src/platforms/posix/px4_layer/sq_remfirst.c
diff --git a/src/platforms/linux/px4_layer/work_cancel.c b/src/platforms/posix/px4_layer/work_cancel.c
index 6f737877d..6f737877d 100644
--- a/src/platforms/linux/px4_layer/work_cancel.c
+++ b/src/platforms/posix/px4_layer/work_cancel.c
diff --git a/src/platforms/linux/px4_layer/work_queue.c b/src/platforms/posix/px4_layer/work_queue.c
index cd96aacd2..cd96aacd2 100644
--- a/src/platforms/linux/px4_layer/work_queue.c
+++ b/src/platforms/posix/px4_layer/work_queue.c
diff --git a/src/platforms/linux/px4_layer/work_thread.c b/src/platforms/posix/px4_layer/work_thread.c
index 9ff9ff892..9ff9ff892 100644
--- a/src/platforms/linux/px4_layer/work_thread.c
+++ b/src/platforms/posix/px4_layer/work_thread.c
diff --git a/src/platforms/linux/tests/hello/hello_example.cpp b/src/platforms/posix/tests/hello/hello_example.cpp
index a30aeb57b..a30aeb57b 100644
--- a/src/platforms/linux/tests/hello/hello_example.cpp
+++ b/src/platforms/posix/tests/hello/hello_example.cpp
diff --git a/src/platforms/linux/tests/hello/hello_example.h b/src/platforms/posix/tests/hello/hello_example.h
index a4ae51705..a4ae51705 100644
--- a/src/platforms/linux/tests/hello/hello_example.h
+++ b/src/platforms/posix/tests/hello/hello_example.h
diff --git a/src/platforms/linux/tests/hello/hello_main.cpp b/src/platforms/posix/tests/hello/hello_main.cpp
index 69e8c21ec..69e8c21ec 100644
--- a/src/platforms/linux/tests/hello/hello_main.cpp
+++ b/src/platforms/posix/tests/hello/hello_main.cpp
diff --git a/src/platforms/qurt/tests/hello/hello_start_linux.cpp b/src/platforms/posix/tests/hello/hello_start_posix.cpp
index 240c5d845..962645fab 100644
--- a/src/platforms/qurt/tests/hello/hello_start_linux.cpp
+++ b/src/platforms/posix/tests/hello/hello_start_posix.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /**
- * @file hello_start_linux.cpp
+ * @file hello_start_posix.cpp
  *
  * @author Thomas Gubler <thomasgubler@gmail.com>
  * @author Mark Charlebois <mcharleb@gmail.com>
diff --git a/src/platforms/linux/tests/hello/module.mk b/src/platforms/posix/tests/hello/module.mk
index 730f9189e..294c0ad7f 100644
--- a/src/platforms/linux/tests/hello/module.mk
+++ b/src/platforms/posix/tests/hello/module.mk
@@ -38,6 +38,6 @@
 MODULE_COMMAND	= hello
 
 SRCS		= hello_main.cpp \
-		  hello_start_linux.cpp \
+		  hello_start_posix.cpp \
 		  hello_example.cpp
 
diff --git a/src/platforms/linux/tests/hrt_test/hrt_test.cpp b/src/platforms/posix/tests/hrt_test/hrt_test.cpp
index baa867033..baa867033 100644
--- a/src/platforms/linux/tests/hrt_test/hrt_test.cpp
+++ b/src/platforms/posix/tests/hrt_test/hrt_test.cpp
diff --git a/src/platforms/linux/tests/hrt_test/hrt_test.h b/src/platforms/posix/tests/hrt_test/hrt_test.h
index c4c97be6d..c4c97be6d 100644
--- a/src/platforms/linux/tests/hrt_test/hrt_test.h
+++ b/src/platforms/posix/tests/hrt_test/hrt_test.h
diff --git a/src/platforms/linux/tests/hrt_test/hrt_test_main.cpp b/src/platforms/posix/tests/hrt_test/hrt_test_main.cpp
index b7c332cd3..b7c332cd3 100644
--- a/src/platforms/linux/tests/hrt_test/hrt_test_main.cpp
+++ b/src/platforms/posix/tests/hrt_test/hrt_test_main.cpp
diff --git a/src/platforms/linux/tests/hrt_test/hrt_test_start_linux.cpp b/src/platforms/posix/tests/hrt_test/hrt_test_start_posix.cpp
index bc53f4e52..9d521364a 100644
--- a/src/platforms/linux/tests/hrt_test/hrt_test_start_linux.cpp
+++ b/src/platforms/posix/tests/hrt_test/hrt_test_start_posix.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /**
- * @file hrt_test_start_linux.cpp
+ * @file hrt_test_start_posix.cpp
  *
  * @author Mark Charlebois <mcharleb@gmail.com>
  */
diff --git a/src/platforms/linux/tests/hrt_test/module.mk b/src/platforms/posix/tests/hrt_test/module.mk
index 559427cd4..e1bd89ef7 100644
--- a/src/platforms/linux/tests/hrt_test/module.mk
+++ b/src/platforms/posix/tests/hrt_test/module.mk
@@ -38,6 +38,6 @@
 MODULE_COMMAND	= hrttest
 
 SRCS		= hrt_test_main.cpp \
-		  hrt_test_start_linux.cpp \
+		  hrt_test_start_posix.cpp \
 		  hrt_test.cpp
 
diff --git a/src/platforms/linux/tests/vcdev_test/module.mk b/src/platforms/posix/tests/vcdev_test/module.mk
index 72cde9e2e..81920c860 100644
--- a/src/platforms/linux/tests/vcdev_test/module.mk
+++ b/src/platforms/posix/tests/vcdev_test/module.mk
@@ -38,6 +38,6 @@
 MODULE_COMMAND	= vcdevtest
 
 SRCS		= vcdevtest_main.cpp \
-		  vcdevtest_start_linux.cpp \
+		  vcdevtest_start_posix.cpp \
 		  vcdevtest_example.cpp
 
diff --git a/src/platforms/linux/tests/vcdev_test/vcdevtest_example.cpp b/src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
index c773da8ba..c773da8ba 100644
--- a/src/platforms/linux/tests/vcdev_test/vcdevtest_example.cpp
+++ b/src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
diff --git a/src/platforms/linux/tests/vcdev_test/vcdevtest_example.h b/src/platforms/posix/tests/vcdev_test/vcdevtest_example.h
index 4898210df..4898210df 100644
--- a/src/platforms/linux/tests/vcdev_test/vcdevtest_example.h
+++ b/src/platforms/posix/tests/vcdev_test/vcdevtest_example.h
diff --git a/src/platforms/linux/tests/vcdev_test/vcdevtest_main.cpp b/src/platforms/posix/tests/vcdev_test/vcdevtest_main.cpp
index 6d8d31a4c..6d8d31a4c 100644
--- a/src/platforms/linux/tests/vcdev_test/vcdevtest_main.cpp
+++ b/src/platforms/posix/tests/vcdev_test/vcdevtest_main.cpp
diff --git a/src/platforms/linux/tests/vcdev_test/vcdevtest_start_linux.cpp b/src/platforms/posix/tests/vcdev_test/vcdevtest_start_posix.cpp
index 9adb65085..5ed9269b2 100644
--- a/src/platforms/linux/tests/vcdev_test/vcdevtest_start_linux.cpp
+++ b/src/platforms/posix/tests/vcdev_test/vcdevtest_start_posix.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /**
- * @file vcdevtest_start_linux.cpp
+ * @file vcdevtest_start_posix.cpp
  *
  * @author Thomas Gubler <thomasgubler@gmail.com>
  * @author Mark Charlebois <mcharleb@gmail.com>
diff --git a/src/platforms/linux/tests/wqueue/module.mk b/src/platforms/posix/tests/wqueue/module.mk
index 29f8f4cf7..4c3b6550c 100644
--- a/src/platforms/linux/tests/wqueue/module.mk
+++ b/src/platforms/posix/tests/wqueue/module.mk
@@ -38,6 +38,6 @@
 MODULE_COMMAND	= wqueue_test
 
 SRCS		= wqueue_main.cpp \
-		  wqueue_start_linux.cpp \
+		  wqueue_start_posix.cpp \
 		  wqueue_test.cpp
 
diff --git a/src/platforms/linux/tests/wqueue/wqueue_main.cpp b/src/platforms/posix/tests/wqueue/wqueue_main.cpp
index a7117cca0..a7117cca0 100644
--- a/src/platforms/linux/tests/wqueue/wqueue_main.cpp
+++ b/src/platforms/posix/tests/wqueue/wqueue_main.cpp
diff --git a/src/platforms/linux/tests/wqueue/wqueue_start_linux.cpp b/src/platforms/posix/tests/wqueue/wqueue_start_poosix.cpp
index 7ac29a0d3..20c997557 100644
--- a/src/platforms/linux/tests/wqueue/wqueue_start_linux.cpp
+++ b/src/platforms/posix/tests/wqueue/wqueue_start_poosix.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /**
- * @file wqueue_start_linux.cpp
+ * @file wqueue_start_posix.cpp
  *
  * @author Thomas Gubler <thomasgubler@gmail.com>
  * @author Mark Charlebois <mcharleb@gmail.com>
diff --git a/src/platforms/linux/tests/wqueue/wqueue_test.cpp b/src/platforms/posix/tests/wqueue/wqueue_test.cpp
index 3fc0e5a91..3fc0e5a91 100644
--- a/src/platforms/linux/tests/wqueue/wqueue_test.cpp
+++ b/src/platforms/posix/tests/wqueue/wqueue_test.cpp
diff --git a/src/platforms/linux/tests/wqueue/wqueue_test.h b/src/platforms/posix/tests/wqueue/wqueue_test.h
index 6db3fc1e2..6db3fc1e2 100644
--- a/src/platforms/linux/tests/wqueue/wqueue_test.h
+++ b/src/platforms/posix/tests/wqueue/wqueue_test.h
diff --git a/src/platforms/px4_adc.h b/src/platforms/px4_adc.h
index bda39d036..42893ef88 100644
--- a/src/platforms/px4_adc.h
+++ b/src/platforms/px4_adc.h
@@ -48,7 +48,7 @@
  * Building for NuttX
  */
 #include <nuttx/analog/adc.h>
-#elif defined(__PX4_LINUX)
+#elif defined(__PX4_POSIX)
 
 // FIXME - this needs to be a px4_adc_msg_s type
 // Curently copied from NuttX
diff --git a/src/platforms/px4_config.h b/src/platforms/px4_config.h
index caeeb09a8..5a187afd6 100644
--- a/src/platforms/px4_config.h
+++ b/src/platforms/px4_config.h
@@ -42,12 +42,12 @@
 
 #if defined(__PX4_NUTTX)
 #include <px4_config.h>
-#elif defined (__PX4_LINUX) || defined (__PX4_QURT)
+#elif defined (__PX4_POSIX) || defined (__PX4_QURT)
 #define CONFIG_NFILE_STREAMS 1
 #define CONFIG_SCHED_WORKQUEUE 1
 #define CONFIG_SCHED_HPWORK 1
 #define CONFIG_SCHED_LPWORK 1
-#define CONFIG_ARCH_BOARD_LINUXTEST 1
+#define CONFIG_ARCH_BOARD_POSIXTEST 1
 
 /** time in ms between checks for work in work queues **/
 #define CONFIG_SCHED_WORKPERIOD 10
diff --git a/src/platforms/px4_defines.h b/src/platforms/px4_defines.h
index ba7ae4c3c..e212e6354 100644
--- a/src/platforms/px4_defines.h
+++ b/src/platforms/px4_defines.h
@@ -67,7 +67,7 @@
 /* Get value of parameter by name, which is equal to the handle for ros */
 #define PX4_PARAM_GET_BYNAME(_name, _destpt) ros::param::get(_name, *_destpt)
 
-#elif defined(__PX4_NUTTX) || defined(__PX4_LINUX) || defined(__PX4_QURT)
+#elif defined(__PX4_NUTTX) || defined(__PX4_POSIX) || defined(__PX4_QURT)
 /*
  * Building for NuttX or Linux
  */
@@ -107,7 +107,7 @@ typedef param_t px4_param_t;
 #define PX4_ISFINITE(x) isfinite(x)
 
 /* Linux Specific defines */
-#elif defined(__PX4_LINUX)
+#elif defined(__PX4_POSIX)
 
 // Flag is meaningless on Linux
 #define O_BINARY 0
@@ -134,7 +134,7 @@ __END_DECLS
 
 
 /* Defines for ROS and Linux */
-#if defined(__PX4_ROS) || defined(__PX4_LINUX) || defined(__PX4_QURT)
+#if defined(__PX4_ROS) || defined(__PX4_POSIX) || defined(__PX4_QURT)
 #define OK 0
 #define ERROR -1
 
diff --git a/src/platforms/px4_i2c.h b/src/platforms/px4_i2c.h
index 9270cb203..3e8d4ea88 100644
--- a/src/platforms/px4_i2c.h
+++ b/src/platforms/px4_i2c.h
@@ -70,7 +70,7 @@ typedef struct i2c_dev_s px4_i2c_dev_t;
 
 #define px4_interrupt_context() up_interrupt_context()
 
-#elif defined(__PX4_LINUX)
+#elif defined(__PX4_POSIX)
 #include <stdint.h>
 
 #define I2C_M_READ           0x0001          /* read data, from slave to master */
diff --git a/src/platforms/px4_includes.h b/src/platforms/px4_includes.h
index f2bd2f969..d71eeea35 100644
--- a/src/platforms/px4_includes.h
+++ b/src/platforms/px4_includes.h
@@ -102,7 +102,7 @@
 #include <systemlib/param/param.h>
 #include <systemlib/systemlib.h>
 
-#elif defined(__PX4_LINUX)
+#elif defined(__PX4_POSIX)
 #include <string.h>
 #include <assert.h>
 #include <uORB/uORB.h>
@@ -110,24 +110,24 @@
 #define ASSERT(x) assert(x)
 
 #ifdef __cplusplus
-#include <platforms/linux/px4_messages/px4_rc_channels.h>
-#include <platforms/linux/px4_messages/px4_vehicle_attitude_setpoint.h>
-#include <platforms/linux/px4_messages/px4_manual_control_setpoint.h>
-#include <platforms/linux/px4_messages/px4_actuator_controls.h>
-#include <platforms/linux/px4_messages/px4_actuator_controls_0.h>
-#include <platforms/linux/px4_messages/px4_actuator_controls_1.h>
-#include <platforms/linux/px4_messages/px4_actuator_controls_2.h>
-#include <platforms/linux/px4_messages/px4_actuator_controls_3.h>
-#include <platforms/linux/px4_messages/px4_vehicle_rates_setpoint.h>
-#include <platforms/linux/px4_messages/px4_vehicle_attitude.h>
-#include <platforms/linux/px4_messages/px4_vehicle_control_mode.h>
-#include <platforms/linux/px4_messages/px4_actuator_armed.h>
-#include <platforms/linux/px4_messages/px4_parameter_update.h>
-#include <platforms/linux/px4_messages/px4_vehicle_status.h>
-#include <platforms/linux/px4_messages/px4_vehicle_local_position_setpoint.h>
-#include <platforms/linux/px4_messages/px4_vehicle_global_velocity_setpoint.h>
-#include <platforms/linux/px4_messages/px4_vehicle_local_position.h>
-#include <platforms/linux/px4_messages/px4_position_setpoint_triplet.h>
+#include <platforms/posix/px4_messages/px4_rc_channels.h>
+#include <platforms/posix/px4_messages/px4_vehicle_attitude_setpoint.h>
+#include <platforms/posix/px4_messages/px4_manual_control_setpoint.h>
+#include <platforms/posix/px4_messages/px4_actuator_controls.h>
+#include <platforms/posix/px4_messages/px4_actuator_controls_0.h>
+#include <platforms/posix/px4_messages/px4_actuator_controls_1.h>
+#include <platforms/posix/px4_messages/px4_actuator_controls_2.h>
+#include <platforms/posix/px4_messages/px4_actuator_controls_3.h>
+#include <platforms/posix/px4_messages/px4_vehicle_rates_setpoint.h>
+#include <platforms/posix/px4_messages/px4_vehicle_attitude.h>
+#include <platforms/posix/px4_messages/px4_vehicle_control_mode.h>
+#include <platforms/posix/px4_messages/px4_actuator_armed.h>
+#include <platforms/posix/px4_messages/px4_parameter_update.h>
+#include <platforms/posix/px4_messages/px4_vehicle_status.h>
+#include <platforms/posix/px4_messages/px4_vehicle_local_position_setpoint.h>
+#include <platforms/posix/px4_messages/px4_vehicle_global_velocity_setpoint.h>
+#include <platforms/posix/px4_messages/px4_vehicle_local_position.h>
+#include <platforms/posix/px4_messages/px4_position_setpoint_triplet.h>
 #endif
 #include <systemlib/err.h>
 #include <systemlib/param/param.h>
diff --git a/src/platforms/px4_spi.h b/src/platforms/px4_spi.h
index 41289aba0..17397ee7a 100644
--- a/src/platforms/px4_spi.h
+++ b/src/platforms/px4_spi.h
@@ -2,7 +2,7 @@
 
 #ifdef __PX4_NUTTX
 #include <nuttx/spi.h>
-#elif defined(__PX4_LINUX)
+#elif defined(__PX4_POSIX)
 enum spi_dev_e
 {
   SPIDEV_NONE = 0,    /* Not a valid value */
diff --git a/src/platforms/px4_tasks.h b/src/platforms/px4_tasks.h
index b81f7db6a..0f47e53c3 100644
--- a/src/platforms/px4_tasks.h
+++ b/src/platforms/px4_tasks.h
@@ -49,7 +49,7 @@ typedef int px4_task_t;
 
 #define px4_task_exit(x) _exit(x)
 
-#elif defined(__PX4_LINUX) || defined(__PX4_QURT)
+#elif defined(__PX4_POSIX) || defined(__PX4_QURT)
 #include <pthread.h>
 #include <sched.h>
 
diff --git a/src/platforms/px4_workqueue.h b/src/platforms/px4_workqueue.h
index a275faebe..67c2fcdfa 100644
--- a/src/platforms/px4_workqueue.h
+++ b/src/platforms/px4_workqueue.h
@@ -41,7 +41,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
-#elif defined(__PX4_LINUX) || defined(__PX4_QURT)
+#elif defined(__PX4_POSIX) || defined(__PX4_QURT)
 
 #include <stdint.h>
 #include <queue.h>
diff --git a/src/platforms/linux/tests/hello/hello_start_linux.cpp b/src/platforms/qurt/tests/hello/hello_start_posix.cpp
index 240c5d845..240c5d845 100644
--- a/src/platforms/linux/tests/hello/hello_start_linux.cpp
+++ b/src/platforms/qurt/tests/hello/hello_start_posix.cpp
diff --git a/src/platforms/qurt/tests/hello/module.mk b/src/platforms/qurt/tests/hello/module.mk
index 730f9189e..6bed2aea6 100644
--- a/src/platforms/qurt/tests/hello/module.mk
+++ b/src/platforms/qurt/tests/hello/module.mk
@@ -38,6 +38,6 @@
 MODULE_COMMAND	= hello
 
 SRCS		= hello_main.cpp \
-		  hello_start_linux.cpp \
+		  hello_start_qurt.cpp \
 		  hello_example.cpp