diff --git a/src/config/defaults/efi.h b/src/config/defaults/efi.h
index a17c91d05..119d8b160 100644
--- a/src/config/defaults/efi.h
+++ b/src/config/defaults/efi.h
@@ -30,12 +30,6 @@ FILE_SECBOOT ( PERMITTED );
 #define NAP_EFI
 #define SERIAL_SPCR
 
-#define	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
-#define	SANBOOT_PROTO_AOE	/* AoE protocol */
-#define	SANBOOT_PROTO_IB_SRP	/* Infiniband SCSI RDMA protocol */
-#define	SANBOOT_PROTO_FCP	/* Fibre Channel protocol */
-#define	SANBOOT_PROTO_HTTP	/* HTTP SAN protocol */
-
 #define	USB_HCD_XHCI		/* xHCI USB host controller */
 #define	USB_HCD_EHCI		/* EHCI USB host controller */
 #define	USB_HCD_UHCI		/* UHCI USB host controller */
diff --git a/src/config/defaults/linux.h b/src/config/defaults/linux.h
index 0eba7231e..b63279381 100644
--- a/src/config/defaults/linux.h
+++ b/src/config/defaults/linux.h
@@ -29,12 +29,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #define DRIVERS_LINUX
 
-#define SANBOOT_PROTO_ISCSI
-#define SANBOOT_PROTO_AOE
-#define SANBOOT_PROTO_IB_SRP
-#define SANBOOT_PROTO_FCP
-#define SANBOOT_PROTO_HTTP
-
 #if defined ( __i386__ ) || defined ( __x86_64__ )
 #define ENTROPY_RDRAND
 #endif
diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h
index f56fc9577..3a366aeb7 100644
--- a/src/config/defaults/pcbios.h
+++ b/src/config/defaults/pcbios.h
@@ -38,12 +38,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define PXE_STACK		/* PXE stack in iPXE - required for PXELINUX */
 #define PXE_MENU		/* PXE menu booting */
 
-#define	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
-#define	SANBOOT_PROTO_AOE	/* AoE protocol */
-#define	SANBOOT_PROTO_IB_SRP	/* Infiniband SCSI RDMA protocol */
-#define	SANBOOT_PROTO_FCP	/* Fibre Channel protocol */
-#define SANBOOT_PROTO_HTTP	/* HTTP SAN protocol */
-
 #define	USB_HCD_XHCI		/* xHCI USB host controller */
 #define	USB_HCD_EHCI		/* EHCI USB host controller */
 #define	USB_HCD_UHCI		/* UHCI USB host controller */
diff --git a/src/config/general.h b/src/config/general.h
index 3dd9f3fe0..51bdcf1c5 100644
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -77,16 +77,20 @@ FILE_SECBOOT ( PERMITTED );
   #define DOWNLOAD_PROTO_FILE	/* Local filesystem access */
 #endif
 
-/*
+/*****************************************************************************
+ *
  * SAN boot protocols
  *
  */
 
-//#undef	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
-//#undef	SANBOOT_PROTO_AOE	/* AoE protocol */
-//#undef	SANBOOT_PROTO_IB_SRP	/* Infiniband SCSI RDMA protocol */
-//#undef	SANBOOT_PROTO_FCP	/* Fibre Channel protocol */
-//#undef	SANBOOT_PROTO_HTTP	/* HTTP SAN protocol */
+/* Protocols supported on all platforms with SAN boot abstractions */
+#if ! defined ( SANBOOT_NULL )
+  #define SANBOOT_PROTO_AOE	/* AoE protocol */
+  #define SANBOOT_PROTO_FCP	/* Fibre Channel protocol */
+  #define SANBOOT_PROTO_HTTP	/* HTTP SAN protocol */
+  #define SANBOOT_PROTO_IB_SRP	/* Infiniband SCSI RDMA protocol */
+  #define SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
+#endif
 
 /*
  * HTTP extensions