libc: Fix all includes in codebase

The codebase was using non-standard headers. It is needed to replace them by the correct ones so that we can use the new libc headers. Change-Id: I530f71d9510cb036e69fe79823c8230afe890b9d Acked-by: Sumit Garg <sumit.garg@linaro.org> Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
2025-04-15 00:54:22 +00:00 · 2018-08-16 16:52:57 +01:00 · 2018-08-16 16:52:57 +01:00 · 93c78ed231
commit 93c78ed231
parent 2fb88cb2e9
71 changed files with 109 additions and 100 deletions
--- a/bl1/bl1_private.h
+++ b/bl1/bl1_private.h
@ -7,7 +7,7 @@
 #ifndef __BL1_PRIVATE_H__
 #define __BL1_PRIVATE_H__

-#include <types.h>
+#include <stdint.h>
 #include <utils_def.h>

 /*******************************************************************************
--- a/bl32/sp_min/sp_min_main.c
+++ b/bl32/sp_min/sp_min_main.c
@ -21,8 +21,8 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <std_svc.h>
+#include <stdint.h>
 #include <string.h>
-#include <types.h>
 #include <utils.h>
 #include "sp_min_private.h"

--- a/include/bl31/ehf.h
+++ b/include/bl31/ehf.h
@ -9,6 +9,7 @@

 #ifndef __ASSEMBLY__

+#include <cdefs.h>
 #include <stdint.h>
 #include <utils_def.h>

--- a/include/common/bl_common.h
+++ b/include/common/bl_common.h
@ -61,7 +61,6 @@
 #include <cassert.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <types.h>
 #include <utils_def.h> /* To retain compatibility */


--- a/include/common/debug.h
+++ b/include/common/debug.h
@ -26,6 +26,7 @@
 #define LOG_LEVEL_VERBOSE		50

 #ifndef __ASSEMBLY__
+#include <cdefs.h>
 #include <stdarg.h>
 #include <stdio.h>

--- a/include/common/ep_info.h
+++ b/include/common/ep_info.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -65,7 +65,7 @@
 #ifndef __ASSEMBLY__

 #include <cassert.h>
-#include <types.h>
+#include <stdint.h>

 typedef struct aapcs64_params {
 	u_register_t arg0;
--- a/include/common/param_header.h
+++ b/include/common/param_header.h
@ -36,7 +36,7 @@

 #ifndef __ASSEMBLY__

-#include <types.h>
+#include <stdint.h>

 /***************************************************************************
 * This structure provides version information and the size of the
--- a/include/drivers/arm/arm_gic.h
+++ b/include/drivers/arm/arm_gic.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -7,6 +7,7 @@
 #ifndef __ARM_GIC_H__
 #define __ARM_GIC_H__

+#include <cdefs.h>
 #include <stdint.h>

 /*******************************************************************************
--- a/include/drivers/arm/gic_v3.h
+++ b/include/drivers/arm/gic_v3.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -17,8 +17,6 @@

 #include <mmio.h>
 #include <stdint.h>
-#include <types.h>
-

 /* GICv3 Re-distributor interface registers & shifts */
 #define GICR_PCPUBASE_SHIFT	0x11
--- a/include/drivers/arm/gicv2.h
+++ b/include/drivers/arm/gicv2.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -116,6 +116,7 @@

 #ifndef __ASSEMBLY__

+#include <cdefs.h>
 #include <interrupt_props.h>
 #include <stdint.h>

--- a/include/drivers/arm/gicv3.h
+++ b/include/drivers/arm/gicv3.h
@ -212,7 +212,6 @@
 #include <gic_common.h>
 #include <interrupt_props.h>
 #include <stdint.h>
-#include <types.h>
 #include <utils_def.h>

 #define gicv3_is_intr_id_special_identifier(id)	\
--- a/include/drivers/arm/pl011.h
+++ b/include/drivers/arm/pl011.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -85,7 +85,7 @@

 #ifndef __ASSEMBLY__

-#include <types.h>
+#include <stdint.h>

 typedef struct {
 	console_t console;
--- a/include/drivers/cadence/cdns_uart.h
+++ b/include/drivers/cadence/cdns_uart.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -29,7 +29,7 @@

 #ifndef __ASSEMBLY__

-#include <types.h>
+#include <stdint.h>

 typedef struct {
 	console_t console;
--- a/include/drivers/console.h
+++ b/include/drivers/console.h
@ -30,7 +30,7 @@

 #ifndef __ASSEMBLY__

-#include <types.h>
+#include <stdint.h>

 typedef struct console {
 	struct console *next;
--- a/include/drivers/dw_ufs.h
+++ b/include/drivers/dw_ufs.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -7,7 +7,7 @@
 #ifndef __DW_UFS_H__
 #define __DW_UFS_H__

-#include <sys/types.h>
+#include <stdint.h>

 /* Bus Throtting */
 #define BUSTHRTL				0xC0
--- a/include/drivers/partition/partition.h
+++ b/include/drivers/partition/partition.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -8,7 +8,7 @@
 #define __PARTITION_H__

 #include <cassert.h>
-#include <types.h>
+#include <stdint.h>

 #if !PLAT_PARTITION_MAX_ENTRIES
 # define PLAT_PARTITION_MAX_ENTRIES	128
--- a/include/drivers/ti/uart/uart_16550.h
+++ b/include/drivers/ti/uart/uart_16550.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -75,7 +75,7 @@

 #ifndef __ASSEMBLY__

-#include <types.h>
+#include <stdint.h>

 typedef struct {
 	console_t console;
--- a/include/lib/aarch32/arch_helpers.h
+++ b/include/lib/aarch32/arch_helpers.h
@ -8,8 +8,9 @@
 #define __ARCH_HELPERS_H__

 #include <arch.h>	/* for additional register definitions */
+#include <cdefs.h>
 #include <stdint.h>
-#include <sys/types.h>
+#include <string.h>

 /**********************************************************************
 * Macros which create inline functions to read or write CPU system
--- a/include/lib/aarch32/smccc_helpers.h
+++ b/include/lib/aarch32/smccc_helpers.h
@ -26,7 +26,7 @@

 #ifndef __ASSEMBLY__
 #include <cassert.h>
-#include <types.h>
+#include <stdint.h>

 /*
 * The generic structure to save arguments and callee saved registers during
--- a/include/lib/aarch64/arch_helpers.h
+++ b/include/lib/aarch64/arch_helpers.h
@ -10,7 +10,7 @@
 #include <arch.h>	/* for additional register definitions */
 #include <cdefs.h>	/* For __dead2 */
 #include <stdint.h>
-#include <sys/types.h>
+#include <string.h>

 /**********************************************************************
 * Macros which create inline functions to read or write CPU system
--- a/include/lib/bakery_lock.h
+++ b/include/lib/bakery_lock.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -12,6 +12,7 @@
 #define BAKERY_LOCK_MAX_CPUS		PLATFORM_CORE_COUNT

 #ifndef __ASSEMBLY__
+#include <cdefs.h>
 #include <stdint.h>

 /*****************************************************************************
--- a/include/lib/cassert.h
+++ b/include/lib/cassert.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -7,6 +7,8 @@
 #ifndef __CASSERT_H__
 #define __CASSERT_H__

+#include <cdefs.h>
+
 /*******************************************************************************
 * Macro to flag a compile time assertion. It uses the preprocessor to generate
 * an invalid C construct if 'cond' evaluates to false.
--- a/include/lib/coreboot.h
+++ b/include/lib/coreboot.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -7,7 +7,7 @@
 #ifndef __COREBOOT_H__
 #define __COREBOOT_H__

-#include <types.h>
+#include <stdint.h>

 typedef struct {
 	uint32_t type;			/* always 2 (memory-mapped) on ARM */
--- a/include/lib/extensions/amu.h
+++ b/include/lib/extensions/amu.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -10,7 +10,6 @@
 #include <cassert.h>
 #include <platform_def.h>
 #include <stdint.h>
-#include <sys/cdefs.h> /* for CASSERT() */

 /* All group 0 counters */
 #define AMU_GROUP0_COUNTERS_MASK	0xf
--- a/include/lib/psci/psci.h
+++ b/include/lib/psci/psci.h
@ -171,7 +171,6 @@
 #ifndef __ASSEMBLY__

 #include <stdint.h>
-#include <types.h>

 /* Function to help build the psci capabilities bitfield */

--- a/include/lib/psci/psci_lib.h
+++ b/include/lib/psci/psci_lib.h
@ -10,7 +10,8 @@
 #include <ep_info.h>

 #ifndef __ASSEMBLY__
-#include <types.h>
+#include <cdefs.h>
+#include <stdint.h>

 /*******************************************************************************
 * Optional structure populated by the Secure Payload Dispatcher to be given a
--- a/include/lib/spinlock.h
+++ b/include/lib/spinlock.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -9,7 +9,7 @@

 #ifndef __ASSEMBLY__

-#include <types.h>
+#include <stdint.h>

 typedef struct spinlock {
 	volatile uint32_t lock;
--- a/include/lib/utils.h
+++ b/include/lib/utils.h
@ -17,7 +17,7 @@
 */
 #if !(defined(__LINKER__) || defined(__ASSEMBLY__))

-#include <types.h>
+#include <stdint.h>

 typedef struct mem_region {
 	uintptr_t base;
--- a/include/lib/xlat_tables/xlat_mmu_helpers.h
+++ b/include/lib/xlat_tables/xlat_mmu_helpers.h
@ -54,7 +54,7 @@

 #include <stdbool.h>
 #include <stdint.h>
-#include <sys/types.h>
+#include <string.h>

 /*
 * Return the values that the MMU configuration registers must contain for the
--- a/include/plat/arm/css/common/css_pm.h
+++ b/include/plat/arm/css/common/css_pm.h
@ -9,7 +9,7 @@

 #include <cdefs.h>
 #include <psci.h>
-#include <types.h>
+#include <stdint.h>

 /* System power domain at level 2, as currently implemented by CSS platforms */
 #define CSS_SYSTEM_PWR_DMN_LVL		ARM_PWR_LVL2
--- a/include/plat/common/common_def.h
+++ b/include/plat/common/common_def.h
@ -8,6 +8,7 @@

 #include <bl_common.h>
 #include <platform_def.h>
+#include <xlat_tables_defs.h>

 /******************************************************************************
 * Required platform porting definitions that are expected to be common to
--- a/include/plat/common/platform.h
+++ b/include/plat/common/platform.h
@ -9,8 +9,6 @@

 #include <psci.h>
 #include <stdint.h>
-#include <types.h>
-

 /*******************************************************************************
 * Forward declarations
--- a/include/services/secure_partition.h
+++ b/include/services/secure_partition.h
@ -7,7 +7,7 @@
 #ifndef __SECURE_PARTITION_H__
 #define __SECURE_PARTITION_H__

-#include <types.h>
+#include <stdint.h>
 #include <utils_def.h>

 /*
--- a/lib/compiler-rt/builtins/int_lib.h
+++ b/lib/compiler-rt/builtins/int_lib.h
@ -14,7 +14,7 @@
 */

 /*
- * Portions copyright (c) 2017, ARM Limited and Contributors.
+ * Portions copyright (c) 2017-2018, ARM Limited and Contributors.
 * All rights reserved.
 */

@ -63,9 +63,8 @@
 * Kernel and boot environment can't use normal headers,
 * so use the equivalent system headers.
 */
-#  include <sys/limits.h>
-#  include <sys/stdint.h>
-#  include <sys/types.h>
+#  include <limits.h>
+#  include <stdint.h>

 /* Include the commonly used internal type definitions. */
 #include "int_types.h"
--- a/lib/libc/assert.c
+++ b/lib/libc/assert.c
@ -1,10 +1,11 @@
 /*
- * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */

 #include <assert.h>
+#include <cdefs.h>
 #include <console.h>
 #include <debug.h>
 #include <platform.h>
--- a/lib/xlat_tables/aarch64/xlat_tables.c
+++ b/lib/xlat_tables/aarch64/xlat_tables.c
@ -10,7 +10,7 @@
 #include <bl_common.h>
 #include <common_def.h>
 #include <platform_def.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <utils.h>
 #include <xlat_tables.h>
 #include <xlat_tables_arch.h>
--- a/lib/xlat_tables/xlat_tables_common.c
+++ b/lib/xlat_tables/xlat_tables_common.c
@ -12,8 +12,8 @@
 #include <debug.h>
 #include <platform_def.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
-#include <types.h>
 #include <utils.h>
 #include <xlat_tables.h>
 #include "xlat_tables_private.h"
--- a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c
+++ b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c
@ -9,7 +9,7 @@
 #include <assert.h>
 #include <cassert.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <utils_def.h>
 #include <xlat_tables_v2.h>
 #include "../xlat_tables_private.h"
--- a/lib/xlat_tables_v2/xlat_tables_core.c
+++ b/lib/xlat_tables_v2/xlat_tables_core.c
@ -10,8 +10,8 @@
 #include <errno.h>
 #include <platform_def.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
-#include <types.h>
 #include <utils_def.h>
 #include <xlat_tables_defs.h>
 #include <xlat_tables_v2.h>
--- a/lib/xlat_tables_v2/xlat_tables_utils.c
+++ b/lib/xlat_tables_v2/xlat_tables_utils.c
@ -10,7 +10,7 @@
 #include <errno.h>
 #include <platform_def.h>
 #include <stdbool.h>
-#include <types.h>
+#include <stdint.h>
 #include <utils_def.h>
 #include <xlat_tables_defs.h>
 #include <xlat_tables_v2.h>
--- a/plat/arm/css/drivers/scp/css_scp.h
+++ b/plat/arm/css/drivers/scp/css_scp.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -9,7 +9,7 @@

 #include <cassert.h>
 #include <platform_def.h>
-#include <types.h>
+#include <stdint.h>

 /* Forward declarations */
 struct psci_power_state;
--- a/plat/hisilicon/hikey/hikey_security.c
+++ b/plat/hisilicon/hikey/hikey_security.c
@ -8,7 +8,7 @@
 #include <debug.h>
 #include <platform_def.h>
 #include <stdint.h>
-#include <strings.h>
+#include <string.h>
 #include <utils_def.h>
 #include "hikey_private.h"

--- a/plat/imx/common/include/imx8_lpuart.h
+++ b/plat/imx/common/include/imx8_lpuart.h
@ -52,7 +52,7 @@

 #ifndef __ASSEMBLY__

-#include <types.h>
+#include <stdint.h>

 typedef struct {
 	console_t console;
--- a/plat/imx/common/include/sci/sci_scfw.h
+++ b/plat/imx/common/include/sci/sci_scfw.h
@ -9,7 +9,7 @@

 /* Includes */

-#include <types.h>
+#include <stdint.h>

 #ifdef __cplusplus
  #define   __I     volatile             /*!< Defines 'read only' permissions                 */
--- a/plat/imx/common/sci/imx8_mu.h
+++ b/plat/imx/common/sci/imx8_mu.h
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <types.h>
+#include <stdint.h>

 #define MU_ATR0_OFFSET1		0x0
 #define MU_ARR0_OFFSET1		0x10
--- a/plat/layerscape/board/ls1043/ls1043_psci.c
+++ b/plat/layerscape/board/ls1043/ls1043_psci.c
@ -5,15 +5,15 @@
 */

 #include <arch_helpers.h>
-#include <debug.h>
-#include <errno.h>
 #include <assert.h>
+#include <debug.h>
+#include <delay_timer.h>
+#include <endian.h>
+#include <errno.h>
+#include <gicv2.h>
+#include <mmio.h>
 #include <platform.h>
 #include <psci.h>
-#include <mmio.h>
-#include <sys/endian.h>
-#include <gicv2.h>
-#include <delay_timer.h>
 #include "platform_def.h"

 #define LS_SCFG_BASE			0x01570000
--- a/plat/layerscape/common/include/ls_16550.h
+++ b/plat/layerscape/common/include/ls_16550.h
@ -65,7 +65,7 @@

 #ifndef __ASSEMBLY__

-#include <types.h>
+#include <stdint.h>

 typedef struct {
 	console_t console;
--- a/plat/layerscape/common/include/plat_ls.h
+++ b/plat/layerscape/common/include/plat_ls.h
@ -7,8 +7,8 @@
 #ifndef __PLAT_LS_H__
 #define __PLAT_LS_H__

-#include <sys/types.h>
 #include <cpu_data.h>
+#include <stdint.h>

 /* BL1 utility functions */
 void ls_bl1_platform_setup(void);
--- a/plat/nvidia/tegra/common/drivers/smmu/smmu.c
+++ b/plat/nvidia/tegra/common/drivers/smmu/smmu.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -12,6 +12,8 @@
 #include <string.h>
 #include <tegra_private.h>

+extern void memcpy16(void *dest, const void *src, unsigned int length);
+
 /* SMMU IDs currently supported by the driver */
 enum {
 	TEGRA_SMMU0,
--- a/plat/nvidia/tegra/common/tegra_bl31_setup.c
+++ b/plat/nvidia/tegra/common/tegra_bl31_setup.c
@ -28,6 +28,7 @@
 /* length of Trusty's input parameters (in bytes) */
 #define TRUSTY_PARAMS_LEN_BYTES	(4096*2)

+extern void memcpy16(void *dest, const void *src, unsigned int length);
 extern void zeromem16(void *mem, unsigned int length);

 /*******************************************************************************
--- a/plat/nvidia/tegra/include/drivers/memctrl_v2.h
+++ b/plat/nvidia/tegra/include/drivers/memctrl_v2.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -11,7 +11,7 @@

 #ifndef __ASSEMBLY__

-#include <sys/types.h>
+#include <stdint.h>

 /*******************************************************************************
 * StreamID to indicate no SMMU translations (requests to be steered on the
--- a/plat/nvidia/tegra/include/tegra_platform.h
+++ b/plat/nvidia/tegra/include/tegra_platform.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -7,7 +7,7 @@
 #ifndef __TEGRA_PLATFORM_H__
 #define __TEGRA_PLATFORM_H__

-#include <sys/cdefs.h>
+#include <cdefs.h>

 /*
 * Tegra chip major/minor version
--- a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c
+++ b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -10,10 +10,10 @@
 #include <debug.h>
 #include <delay_timer.h>
 #include <denver.h>
+#include <errno.h>
 #include <mce_private.h>
 #include <mmio.h>
 #include <platform.h>
-#include <sys/errno.h>
 #include <t18x_ari.h>

 /*******************************************************************************
--- a/plat/nvidia/tegra/soc/t186/drivers/mce/mce.c
+++ b/plat/nvidia/tegra/soc/t186/drivers/mce/mce.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -12,11 +12,11 @@
 #include <context_mgmt.h>
 #include <debug.h>
 #include <denver.h>
+#include <errno.h>
 #include <mce.h>
 #include <mce_private.h>
 #include <mmio.h>
 #include <string.h>
-#include <sys/errno.h>
 #include <t18x_ari.h>
 #include <tegra_def.h>
 #include <tegra_platform.h>
--- a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c
+++ b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -8,9 +8,9 @@
 #include <arch_helpers.h>
 #include <debug.h>
 #include <denver.h>
+#include <errno.h>
 #include <mce_private.h>
 #include <mmio.h>
-#include <sys/errno.h>
 #include <t18x_ari.h>

 int32_t nvg_enter_cstate(uint32_t ari_base, uint32_t state, uint32_t wake_time)
--- a/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c
+++ b/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -20,6 +20,8 @@
 #include <t18x_ari.h>
 #include <tegra_private.h>

+extern void memcpy16(void *dest, const void *src, unsigned int length);
+
 extern void prepare_cpu_pwr_dwn(void);
 extern void tegra186_cpu_reset_handler(void);
 extern uint32_t __tegra186_cpu_reset_handler_end,
--- a/plat/nvidia/tegra/soc/t186/plat_secondary.c
+++ b/plat/nvidia/tegra/soc/t186/plat_secondary.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -21,6 +21,8 @@

 #define CPU_RESET_MODE_AA64		1

+extern void memcpy16(void *dest, const void *src, unsigned int length);
+
 extern uint64_t tegra_bl31_phys_base;
 extern uint64_t __tegra186_cpu_reset_handler_end;

--- a/plat/qemu/qemu_private.h
+++ b/plat/qemu/qemu_private.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -7,9 +7,8 @@
 #ifndef __QEMU_PRIVATE_H
 #define __QEMU_PRIVATE_H

-#include <sys/types.h>
+#include <stdint.h>

-#include <xlat_tables_defs.h>
 #include "../../bl1/bl1_private.h"

 void qemu_configure_mmu_secure(unsigned long total_base,
--- a/plat/qemu/topology.c
+++ b/plat/qemu/topology.c
@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */

 #include <arch.h>
 #include <platform_def.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include "qemu_private.h"

 /* The power domain tree descriptor */
--- a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c
+++ b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c
@ -4,6 +4,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

+#include <cdefs.h>
 #include <cdn_dp.h>
 #include <smccc.h>
 #include <stdlib.h>
--- a/plat/rpi3/rpi3_private.h
+++ b/plat/rpi3/rpi3_private.h
@ -7,7 +7,7 @@
 #ifndef __RPI3_PRIVATE_H__
 #define __RPI3_PRIVATE_H__

-#include <sys/types.h>
+#include <stdint.h>

 /*******************************************************************************
 * Function and variable prototypes
--- a/plat/rpi3/rpi3_stack_protector.c
+++ b/plat/rpi3/rpi3_stack_protector.c
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <sys/types.h>
+#include <stdint.h>
 #include <utils.h>

 #include "rpi3_private.h"
--- a/plat/rpi3/rpi3_topology.c
+++ b/plat/rpi3/rpi3_topology.c
@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */

 #include <arch.h>
 #include <platform_def.h>
-#include <sys/types.h>
+#include <stdint.h>

 #include "rpi3_private.h"

--- a/plat/socionext/synquacer/include/sq_common.h
+++ b/plat/socionext/synquacer/include/sq_common.h
@ -7,7 +7,7 @@
 #ifndef __SQ_COMMON_H__
 #define __SQ_COMMON_H__

-#include <sys/types.h>
+#include <stdint.h>
 #include <xlat_tables_v2.h>

 struct draminfo {
--- a/plat/socionext/uniphier/uniphier.h
+++ b/plat/socionext/uniphier/uniphier.h
@ -8,7 +8,7 @@
 #define __UNIPHIER_H__

 #include <stdint.h>
-#include <types.h>
+#include <string.h>

 unsigned int uniphier_get_soc_type(void);
 unsigned int uniphier_get_soc_model(void);
--- a/plat/socionext/uniphier/uniphier_emmc.c
+++ b/plat/socionext/uniphier/uniphier_emmc.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -9,7 +9,7 @@
 #include <io/io_block.h>
 #include <mmio.h>
 #include <platform_def.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <utils_def.h>

 #include "uniphier.h"
--- a/plat/socionext/uniphier/uniphier_io_storage.c
+++ b/plat/socionext/uniphier/uniphier_io_storage.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -12,7 +12,7 @@
 #include <io/io_fip.h>
 #include <io/io_memmap.h>
 #include <platform_def.h>
-#include <types.h>
+#include <stdint.h>
 #include <utils_def.h>
 #include <xlat_tables_v2.h>

--- a/plat/socionext/uniphier/uniphier_nand.c
+++ b/plat/socionext/uniphier/uniphier_nand.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -9,7 +9,7 @@
 #include <io/io_block.h>
 #include <mmio.h>
 #include <platform_def.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <utils_def.h>

 #include "uniphier.h"
--- a/plat/socionext/uniphier/uniphier_usb.c
+++ b/plat/socionext/uniphier/uniphier_usb.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
@ -9,7 +9,7 @@
 #include <io/io_block.h>
 #include <mmio.h>
 #include <platform_def.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <utils_def.h>

 #include "uniphier.h"
--- a/services/std_svc/sdei/sdei_private.h
+++ b/services/std_svc/sdei/sdei_private.h
@ -17,7 +17,7 @@
 #include <setjmp.h>
 #include <spinlock.h>
 #include <stdbool.h>
-#include <types.h>
+#include <stdint.h>
 #include <utils_def.h>

 #ifdef AARCH32
--- a/services/std_svc/spm/spm_shim_private.h
+++ b/services/std_svc/spm/spm_shim_private.h
@ -7,7 +7,7 @@
 #ifndef __SPM_SHIM_PRIVATE__
 #define __SPM_SHIM_PRIVATE__

-#include <types.h>
+#include <stdint.h>
 #include <utils_def.h>

 /* Assembly source */