3 files changed, 6 insertions, 8 deletions
diff --git a/bsps/arm/xilinx-zynq/include/bsp.h b/bsps/arm/xilinx-zynq/include/bsp.h
index fde8d03130..151e603812 100644
--- a/bsps/arm/xilinx-zynq/include/bsp.h
+++ b/bsps/arm/xilinx-zynq/include/bsp.h
@@ -7,7 +7,7 @@
 /*
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (C) 2013, 2014 embedded brains GmbH
+ * Copyright (C) 2013, 2014 embedded brains GmbH & Co. KG
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -54,7 +54,7 @@
 
 #include <bsp/default-initial-extension.h>
 #include <bsp/start.h>
-#include <dev/serial/zynq-uart.h>
+#include <dev/serial/zynq-uart-zynq.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -74,8 +74,6 @@ extern "C" {
 
 #define BSP_ARM_L2C_310_ID 0x410000c8
 
-extern zynq_uart_context zynq_uart_instances[2];
-
 /**
  * @brief Zynq specific set up of the MMU.
  *
diff --git a/bsps/arm/xilinx-zynq/include/bsp/i2c.h b/bsps/arm/xilinx-zynq/include/bsp/i2c.h
index fbdf6ea2c0..93a8b364b1 100644
--- a/bsps/arm/xilinx-zynq/include/bsp/i2c.h
+++ b/bsps/arm/xilinx-zynq/include/bsp/i2c.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (C) 2014 embedded brains GmbH
+ * Copyright (C) 2014 embedded brains GmbH & Co. KG
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,10 +28,11 @@
 #ifndef LIBBSP_ARM_XILINX_ZYNQ_I2C_H
 #define LIBBSP_ARM_XILINX_ZYNQ_I2C_H
 
-#include <bsp/cadence-i2c.h>
 #include <bsp/irq.h>
 #include <bsp.h>
 
+#include <dev/i2c/cadence-i2c.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
diff --git a/bsps/arm/xilinx-zynq/include/bsp/irq.h b/bsps/arm/xilinx-zynq/include/bsp/irq.h
index f4579ae614..61d47c529b 100644
--- a/bsps/arm/xilinx-zynq/include/bsp/irq.h
+++ b/bsps/arm/xilinx-zynq/include/bsp/irq.h
@@ -7,7 +7,7 @@
 /*
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (C) 2013 embedded brains GmbH
+ * Copyright (C) 2013 embedded brains GmbH & Co. KG
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -36,7 +36,6 @@
 
 #ifndef ASM
 
-#include <rtems/irq.h>
 #include <rtems/irq-extension.h>
 
 #include <bsp/arm-a9mpcore-irq.h>