10 files changed, 17 insertions, 17 deletions
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_701.c b/c/src/lib/libbsp/sparc/shared/pci/gr_701.c
index b52b14a214..815b850c6d 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_701.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_701.c
@@ -33,9 +33,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_701.h>
+#include <bsp/gr_701.h>
 
 /* Offset from 0x80000000 (dual bus version) */
 #define AHB1_BASE_ADDR 0x80000000
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c b/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c
index d997162ecd..2423248ade 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c
@@ -40,9 +40,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_leon4_n2x.h>
+#include <bsp/gr_leon4_n2x.h>
 
 /* Determines which PCI address the AHB masters on the LEON-N2X board will
  * access when accessing the AHB to PCI window, it should be set so that the
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c
index 145c9f267e..96225c8b64 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c
@@ -31,9 +31,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_rasta_adcdac.h>
+#include <bsp/gr_rasta_adcdac.h>
 
 /*#define DEBUG 1*/
 
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c
index 06af6d0f9e..417056f692 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c
@@ -31,9 +31,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_rasta_io.h>
+#include <bsp/gr_rasta_io.h>
 
 /* Determines which PCI address the AHB masters will access, it should be
  * set so that the masters can access the CPU RAM. Default is base of CPU RAM,
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c
index 92e6b4af83..986adcc75e 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c
@@ -29,8 +29,8 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
-#include <gr_rasta_spw_router.h>
+#include <bsp/genirq.h>
+#include <bsp/gr_rasta_spw_router.h>
 
 /* Determines which PCI address the AHB masters will access, it should be
  * set so that the masters can access the CPU RAM. Default is base of CPU RAM,
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c
index 7714a00aba..809919ee3c 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c
@@ -31,9 +31,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_rasta_tmtc.h>
+#include <bsp/gr_rasta_tmtc.h>
 
 /* Determines which PCI address the AHB masters will access, it should be
  * set so that the masters can access the CPU RAM. Default is base of CPU RAM,
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c b/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c
index c2bd8ebde9..28d93b493d 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c
@@ -32,9 +32,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_tmtc_1553.h>
+#include <bsp/gr_tmtc_1553.h>
 
 
 /*#define DEBUG 1 */
diff --git a/c/src/lib/libbsp/sparc/shared/pci/grpci.c b/c/src/lib/libbsp/sparc/shared/pci/grpci.c
index af3d0359ab..b417956d90 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/grpci.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/grpci.c
@@ -29,7 +29,7 @@
 #include <drvmgr/ambapp_bus.h>
 #include <ambapp.h>
 #include <drvmgr/pci_bus.h>
-#include <grpci.h>
+#include <bsp/grpci.h>
 
 #define DMAPCI_ADDR 0x80000500
 
diff --git a/c/src/lib/libbsp/sparc/shared/pci/grpci2.c b/c/src/lib/libbsp/sparc/shared/pci/grpci2.c
index 53c4181d68..07bc8038b3 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/grpci2.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/grpci2.c
@@ -40,7 +40,7 @@
 #include <drvmgr/ambapp_bus.h>
 #include <ambapp.h>
 #include <drvmgr/pci_bus.h>
-#include <grpci2.h>
+#include <bsp/grpci2.h>
 
 #ifndef IRQ_GLOBAL_PREPARE
  #define IRQ_GLOBAL_PREPARE(level) rtems_interrupt_level level
diff --git a/c/src/lib/libbsp/sparc/shared/pci/pcif.c b/c/src/lib/libbsp/sparc/shared/pci/pcif.c
index 8ace3dfc5f..32de562283 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/pcif.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/pcif.c
@@ -29,7 +29,7 @@
 #include <drvmgr/ambapp_bus.h>
 #include <ambapp.h>
 #include <drvmgr/pci_bus.h>
-#include <pcif.h>
+#include <bsp/pcif.h>
 
 
 /* Configuration options */