diff --git a/src/drivers/boards/bebop/board_config.h b/src/drivers/boards/bebop/board_config.h
index 595748c81f55..d91ab0ef5a45 100644
--- a/src/drivers/boards/bebop/board_config.h
+++ b/src/drivers/boards/bebop/board_config.h
@@ -39,8 +39,14 @@
 
 #pragma once
 
+#define BOARD_OVERRIDE_UUID "BEBOPID     " // must be of length 12 (PX4_CPU_UUID_BYTE_LENGTH)
+#define BOARD_OVERRIDE_MFGUID BOARD_OVERRIDE_UUID
+
 #define BOARD_NAME "BEBOP"
 #define BOARD_BATTERY1_V_DIV   (10.177939394f)
 #define BOARD_BATTERY1_A_PER_V (15.391030303f)
 #define BOARD_HAS_NO_RESET
 #define BOARD_HAS_NO_BOOTLOADER
+
+#include <system_config.h>
+#include "../common/board_common.h"
diff --git a/src/drivers/boards/eagle/board_config.h b/src/drivers/boards/eagle/board_config.h
index f75c56e8427d..2c253fb05ac7 100644
--- a/src/drivers/boards/eagle/board_config.h
+++ b/src/drivers/boards/eagle/board_config.h
@@ -39,6 +39,12 @@
 
 #pragma once
 
+#define BOARD_OVERRIDE_UUID "EAGLEID     " // must be of length 12 (PX4_CPU_UUID_BYTE_LENGTH)
+#define BOARD_OVERRIDE_MFGUID BOARD_OVERRIDE_UUID
+
 #define BOARD_NAME "EAGLE"
 #define BOARD_BATTERY1_V_DIV   (10.177939394f)
 #define BOARD_BATTERY1_A_PER_V (15.391030303f)
+
+#include <system_config.h>
+#include "../common/board_common.h"
diff --git a/src/drivers/boards/sitl/board_config.h b/src/drivers/boards/sitl/board_config.h
index 435f652e48a7..ac0f16198d7b 100644
--- a/src/drivers/boards/sitl/board_config.h
+++ b/src/drivers/boards/sitl/board_config.h
@@ -39,11 +39,16 @@
 
 #pragma once
 
+#define BOARD_OVERRIDE_UUID "SIMULATIONID" // must be of length 12 (PX4_CPU_UUID_BYTE_LENGTH)
+#define BOARD_OVERRIDE_MFGUID BOARD_OVERRIDE_UUID
+
 #define BOARD_NAME "SITL"
 #define BOARD_BATTERY1_V_DIV   (10.177939394f)
 #define BOARD_BATTERY1_A_PER_V (15.391030303f)
 #define BOARD_HAS_NO_RESET
 #define BOARD_HAS_NO_BOOTLOADER
 
+#define CONFIG_ARCH_BOARD_SITL 1
+
 #include <system_config.h>
 #include "../common/board_common.h"
diff --git a/src/platforms/posix/include/system_config.h b/src/platforms/posix/include/system_config.h
index 64a7fec1dd55..1f2b7dc3c9c8 100644
--- a/src/platforms/posix/include/system_config.h
+++ b/src/platforms/posix/include/system_config.h
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *   Copyright (c) 2017 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file system_config.h
+ *
+ * Definitions used by all SITL and Linux targets
+ */
 
 #pragma once
 
@@ -11,8 +49,6 @@
 
 #define PX4_I2C_OBDEV_LED	0x55
 
-#define BOARD_OVERRIDE_UUID "SIMULATIONID"
-#define BOARD_OVERRIDE_MFGUID BOARD_OVERRIDE_UUID
 #define SIM_FORMATED_UUID "000000010000000200000003"
 #define PX4_CPU_UUID_BYTE_LENGTH 12
 #define PX4_CPU_UUID_WORD32_LENGTH 3
@@ -34,7 +70,6 @@
 #define CONFIG_SCHED_WORKQUEUE 1
 #define CONFIG_SCHED_HPWORK 1
 #define CONFIG_SCHED_LPWORK 1
-#define CONFIG_ARCH_BOARD_SITL 1
 
 /** time in ms between checks for work in work queues **/
 #define CONFIG_SCHED_WORKPERIOD 50000