diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c
index a85bca2d6..639d12660 100644
--- a/litex/soc/software/bios/boot.c
+++ b/litex/soc/software/bios/boot.c
@@ -20,18 +20,16 @@
 #include <generated/csr.h>
 #include <generated/soc.h>
 
-#ifdef CSR_ETHMAC_BASE
-#include <udp.h>
-#include <tftp.h>
-#endif
-
-#ifdef CSR_SPIFLASH_BASE
-#include <spiflash.h>
-#endif
-
 #include "sfl.h"
 #include "boot.h"
 
+#include <spiflash.h>
+
+#include <libliteeth/udp.h>
+#include <libliteeth/tftp.h>
+
+#include <liblitesdcard/spisdcard.h>
+
 extern void boot_helper(unsigned long r1, unsigned long r2, unsigned long r3, unsigned long addr);
 
 static void __attribute__((noreturn)) boot(unsigned long r1, unsigned long r2, unsigned long r3, unsigned long addr)
@@ -497,7 +495,6 @@ void romboot(void)
 
 // SPI HARDWARE BITBANG
 #ifdef CSR_SPISDCARD_BASE
-#include "spisdcard.h"
 
 void spisdcardboot(void)
 {
diff --git a/litex/soc/software/bios/cmds/cmd_bios.c b/litex/soc/software/bios/cmds/cmd_bios.c
index bbca856ce..cf555ef09 100644
--- a/litex/soc/software/bios/cmds/cmd_bios.c
+++ b/litex/soc/software/bios/cmds/cmd_bios.c
@@ -2,12 +2,12 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <id.h>
-#include <generated/csr.h>
 #include <crc.h>
 #include <system.h>
 
+#include <generated/csr.h>
+
 #include "../command.h"
 #include "../helpers.h"
 
diff --git a/litex/soc/software/bios/cmds/cmd_litedram.c b/litex/soc/software/bios/cmds/cmd_litedram.c
index 0b9ea2280..b9a9f225b 100644
--- a/litex/soc/software/bios/cmds/cmd_litedram.c
+++ b/litex/soc/software/bios/cmds/cmd_litedram.c
@@ -5,7 +5,7 @@
 
 #include <generated/csr.h>
 
-#include "sdram.h"
+#include <liblitedram/sdram.h>
 
 #include "../command.h"
 #include "../helpers.h"
diff --git a/litex/soc/software/bios/cmds/cmd_liteeth.c b/litex/soc/software/bios/cmds/cmd_liteeth.c
index f9df1d248..e8702f678 100644
--- a/litex/soc/software/bios/cmds/cmd_liteeth.c
+++ b/litex/soc/software/bios/cmds/cmd_liteeth.c
@@ -5,7 +5,7 @@
 
 #include <generated/csr.h>
 
-#include "mdio.h"
+#include <libliteeth/mdio.h>
 
 #include "../command.h"
 #include "../helpers.h"
diff --git a/litex/soc/software/bios/cmds/cmd_litesdcard.c b/litex/soc/software/bios/cmds/cmd_litesdcard.c
index d5d1651f8..4cac68f26 100644
--- a/litex/soc/software/bios/cmds/cmd_litesdcard.c
+++ b/litex/soc/software/bios/cmds/cmd_litesdcard.c
@@ -5,7 +5,7 @@
 
 #include <generated/csr.h>
 
-#include "sdcard.h"
+#include <liblitesdcard/sdcard.h>
 
 #include "../command.h"
 #include "../helpers.h"
diff --git a/litex/soc/software/bios/cmds/cmd_mem.c b/litex/soc/software/bios/cmds/cmd_mem.c
index 8c63d4c44..01c607e1f 100644
--- a/litex/soc/software/bios/cmds/cmd_mem.c
+++ b/litex/soc/software/bios/cmds/cmd_mem.c
@@ -3,6 +3,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <generated/csr.h>
+
 #include "../command.h"
 #include "../helpers.h"
 
diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c
index 9d1dc85be..dc2117ad4 100644
--- a/litex/soc/software/bios/main.c
+++ b/litex/soc/software/bios/main.c
@@ -25,30 +25,26 @@
 #include <irq.h>
 #include <crc.h>
 
+#include "boot.h"
+#include "readline.h"
+#include "helpers.h"
+#include "command.h"
+
 #include <generated/csr.h>
 #include <generated/soc.h>
 #include <generated/mem.h>
 #include <generated/git.h>
 
-#ifdef CSR_ETHMAC_BASE
-#include "udp.h"
-#endif
-
-#ifdef CSR_SPIFLASH_BASE
 #include <spiflash.h>
-#endif
 
-#ifdef CSR_ETHPHY_MDIO_W_ADDR
-#include "mdio.h"
-#endif
+#include <liblitedram/sdram.h>
 
-#include "sdram.h"
-#include "sdcard.h"
-//#include "spi.h"
-#include "boot.h"
-#include "readline.h"
-#include "helpers.h"
-#include "command.h"
+#include <libliteeth/udp.h>
+#include <libliteeth/mdio.h>
+
+#include <liblitespi/spiflash.h>
+
+#include <liblitesdcard/sdcard.h>
 
 static void boot_sequence(void)
 {
diff --git a/litex/soc/software/common.mak b/litex/soc/software/common.mak
index 1431ad552..802a48b8d 100644
--- a/litex/soc/software/common.mak
+++ b/litex/soc/software/common.mak
@@ -47,12 +47,9 @@ DEPFLAGS += -MD -MP
 #
 INCLUDES = -I$(SOC_DIRECTORY)/software/include/base \
            -I$(SOC_DIRECTORY)/software/include \
-           -I$(SOC_DIRECTORY)/common \
+           -I$(SOC_DIRECTORY)/software \
            -I$(BUILDINC_DIRECTORY) \
-           -I$(CPU_DIRECTORY) \
-           -I$(SOC_DIRECTORY)/software/liblitedram \
-           -I$(SOC_DIRECTORY)/software/libliteeth \
-           -I$(SOC_DIRECTORY)/software/liblitesdcard
+           -I$(CPU_DIRECTORY)
 COMMONFLAGS = $(DEPFLAGS) -Os $(CPUFLAGS) -g3 -fomit-frame-pointer -Wall -fno-builtin -nostdinc $(INCLUDES)
 CFLAGS = $(COMMONFLAGS) -fexceptions -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes
 CXXFLAGS = $(COMMONFLAGS) -std=c++11 -I$(SOC_DIRECTORY)/software/include/basec++ -fexceptions -fno-rtti -ffreestanding