diff --git a/src/modules/systemlib/err.h b/src/modules/systemlib/err.h
index 7c09bf7b0f..bc6e239476 100644
--- a/src/modules/systemlib/err.h
+++ b/src/modules/systemlib/err.h
@@ -66,7 +66,6 @@
 #define _SYSTEMLIB_ERR_H
 
 #include <px4_log.h>
-#include <px4_tasks.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/modules/systemlib/mixer/mixer_multirotor.cpp b/src/modules/systemlib/mixer/mixer_multirotor.cpp
index 981fc3cdf2..5eebb935e9 100644
--- a/src/modules/systemlib/mixer/mixer_multirotor.cpp
+++ b/src/modules/systemlib/mixer/mixer_multirotor.cpp
@@ -40,6 +40,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <float.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/src/modules/systemlib/param/param.c b/src/modules/systemlib/param/param.c
index 277aadef3b..f0d38d98b6 100644
--- a/src/modules/systemlib/param/param.c
+++ b/src/modules/systemlib/param/param.c
@@ -48,6 +48,7 @@
 #include <px4_spi.h>
 #include <string.h>
 #include <stdbool.h>
+#include <float.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/modules/systemlib/systemlib.h b/src/modules/systemlib/systemlib.h
index 06e84c751d..73955c0b26 100644
--- a/src/modules/systemlib/systemlib.h
+++ b/src/modules/systemlib/systemlib.h
@@ -39,67 +39,5 @@
 
 #ifndef SYSTEMLIB_H_
 #define SYSTEMLIB_H_
-#include <float.h>
-#include <stdint.h>
-#include <sched.h>
-
-// OS specific settings defined in px4_tasks.h
-#include <px4_tasks.h>
-
-__BEGIN_DECLS
-
-enum MULT_PORTS {
-	MULT_0_US2_RXTX = 0,
-	MULT_1_US2_FLOW,
-	MULT_2_GPIO_12,
-	MULT_COUNT
-};
-
-#if defined(__cplusplus)
-/* Check max multi port count */
-static_assert(MULT_COUNT <= 33, "MULT_COUNT HAS TO BE LESS THAN OR EQUAL 33");
-#endif
-
-/* FMU board info, to be stored in the first 64 bytes of the FMU EEPROM */
-#pragma pack(push,1)
-struct fmu_board_info_s {
-	char header[3];				/**< {'P', 'X', '4'} */
-	char board_name[20];			/**< Human readable board name, \0 terminated */
-	uint8_t board_id;			/**< board ID, constantly increasing number per board */
-	uint8_t board_version;			/**< board version, major * 10 + minor: v1.7 = 17 */
-	uint8_t multi_port_config[MULT_COUNT];	/**< Configuration of multi ports 1-3		  */
-	uint8_t reserved[33 - MULT_COUNT];	/**< Reserved space for more multi ports	  */
-	uint16_t production_year;
-	uint8_t production_month;
-	uint8_t production_day;
-	uint8_t production_fab;
-	uint8_t production_tester;
-}; /**< stores autopilot board information meta data from EEPROM */
-#pragma pack(pop)
-
-/* Carrier board info, to be stored in the 128 byte board info EEPROM */
-#pragma pack(push,1)
-struct carrier_board_info_s {
-	char header[3];				/**< {'P', 'X', '4'} */
-	char board_name[20];			/**< Human readable board name, \0 terminated */
-	uint8_t board_id;			/**< board ID, constantly increasing number per board */
-	uint8_t board_version;			/**< board version, major * 10 + minor: v1.7 = 17 */
-	uint8_t multi_port_config[MULT_COUNT];	/**< Configuration of multi ports 1-3		  */
-	uint8_t reserved[33 - MULT_COUNT];	/**< Reserved space for more multi ports	  */
-	uint16_t production_year;
-	uint8_t production_month;
-	uint8_t production_day;
-	uint8_t production_fab;
-	uint8_t production_tester;
-	char board_custom_data[64];
-}; /**< stores carrier board information meta data from EEPROM */
-#pragma pack(pop)
-
-struct __multiport_info {
-	const char *port_names[MULT_COUNT];
-};
-__EXPORT extern const struct __multiport_info multiport_info;
-
-__END_DECLS
 
 #endif /* SYSTEMLIB_H_ */