diff --git a/block/Makefile.objs b/block/Makefile.objs
index 0b707ecbf8..d644bac60a 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -1,10 +1,10 @@
 block-obj-y += raw-format.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o dmg.o
 block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o qcow2-bitmap.o
-#block-obj-y += qed.o qed-l2-cache.o qed-table.o qed-cluster.o
-#block-obj-y += qed-check.o
-#block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o
-#block-obj-y += quorum.o
-#block-obj-y += parallels.o blkdebug.o blkverify.o blkreplay.o
+block-obj-y += qed.o qed-l2-cache.o qed-table.o qed-cluster.o
+block-obj-y += qed-check.o
+block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o
+block-obj-y += quorum.o
+block-obj-y += parallels.o blkdebug.o blkverify.o blkreplay.o
 block-obj-y += block-backend.o snapshot.o qapi.o
 block-obj-$(CONFIG_WIN32) += file-win32.o win32-aio.o
 block-obj-$(CONFIG_POSIX) += file-posix.o
@@ -13,15 +13,15 @@ block-obj-y += null.o mirror.o commit.o io.o create.o
 block-obj-y += throttle-groups.o
 block-obj-$(CONFIG_LINUX) += nvme.o
 
-#block-obj-y += nbd.o nbd-client.o sheepdog.o
-#block-obj-$(CONFIG_LIBISCSI) += iscsi.o
-#block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o
-#block-obj-$(CONFIG_LIBNFS) += nfs.o
-#block-obj-$(CONFIG_CURL) += curl.o
-#block-obj-$(CONFIG_RBD) += rbd.o
-#block-obj-$(CONFIG_GLUSTERFS) += gluster.o
-#block-obj-$(CONFIG_VXHS) += vxhs.o
-#block-obj-$(CONFIG_LIBSSH2) += ssh.o
+block-obj-y += nbd.o nbd-client.o sheepdog.o
+block-obj-$(CONFIG_LIBISCSI) += iscsi.o
+block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o
+block-obj-$(CONFIG_LIBNFS) += nfs.o
+block-obj-$(CONFIG_CURL) += curl.o
+block-obj-$(CONFIG_RBD) += rbd.o
+block-obj-$(CONFIG_GLUSTERFS) += gluster.o
+block-obj-$(CONFIG_VXHS) += vxhs.o
+block-obj-$(CONFIG_LIBSSH2) += ssh.o
 block-obj-y += accounting.o dirty-bitmap.o
 block-obj-y += write-threshold.o
 block-obj-y += backup.o
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 46efc2c434..8c7d4a0fa0 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -1,20 +1,20 @@
 # Default configuration for i386-softmmu
 
 include pci.mak
-# include sound.mak
+include sound.mak
 include usb.mak
 CONFIG_QXL=$(CONFIG_SPICE)
-# CONFIG_VGA_ISA=y
-# CONFIG_VGA_CIRRUS=y
-# CONFIG_VMWARE_VGA=y
-# CONFIG_VMXNET3_PCI=y
-# CONFIG_VIRTIO_VGA=y
+CONFIG_VGA_ISA=y
+CONFIG_VGA_CIRRUS=y
+CONFIG_VMWARE_VGA=y
+CONFIG_VMXNET3_PCI=y
+CONFIG_VIRTIO_VGA=y
 CONFIG_VMMOUSE=y
-# CONFIG_IPMI=y
-# CONFIG_IPMI_LOCAL=y
-# CONFIG_IPMI_EXTERN=y
-# CONFIG_ISA_IPMI_KCS=y
-# CONFIG_ISA_IPMI_BT=y
+CONFIG_IPMI=y
+CONFIG_IPMI_LOCAL=y
+CONFIG_IPMI_EXTERN=y
+CONFIG_ISA_IPMI_KCS=y
+CONFIG_ISA_IPMI_BT=y
 CONFIG_SERIAL=y
 CONFIG_SERIAL_ISA=y
 CONFIG_PARALLEL=y
@@ -32,15 +32,15 @@ CONFIG_I8257=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
-# CONFIG_HPET=y
-# CONFIG_APPLESMC=y
+CONFIG_HPET=y
+CONFIG_APPLESMC=y
 CONFIG_I8259=y
 CONFIG_PFLASH_CFI01=y
-# CONFIG_TPM_TIS=$(CONFIG_TPM)
-# CONFIG_TPM_CRB=$(CONFIG_TPM)
+CONFIG_TPM_TIS=$(CONFIG_TPM)
+CONFIG_TPM_CRB=$(CONFIG_TPM)
 CONFIG_MC146818RTC=y
 CONFIG_PCI_PIIX=y
-# CONFIG_WDT_IB700=y
+CONFIG_WDT_IB700=y
 CONFIG_ISA_DEBUG=y
 CONFIG_ISA_TESTDEV=y
 CONFIG_VMPORT=y
@@ -53,16 +53,16 @@ CONFIG_PVPANIC=y
 CONFIG_MEM_HOTPLUG=y
 CONFIG_NVDIMM=y
 CONFIG_ACPI_NVDIMM=y
-# CONFIG_PCIE_PORT=y
-# CONFIG_XIO3130=y
-# CONFIG_IOH3420=y
-# CONFIG_I82801B11=y
+CONFIG_PCIE_PORT=y
+CONFIG_XIO3130=y
+CONFIG_IOH3420=y
+CONFIG_I82801B11=y
 CONFIG_SMBIOS=y
-# CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
-# CONFIG_PXB=y
+CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
+CONFIG_PXB=y
 CONFIG_ACPI_VMGENID=y
-# CONFIG_FW_CFG_DMA=y
+CONFIG_FW_CFG_DMA=y
 CONFIG_I2C=y
 CONFIG_SEV=$(CONFIG_KVM)
 CONFIG_VTD=y
-# CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU=y
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 1ced5e0916..35e7596949 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -6,44 +6,44 @@ CONFIG_VIRTIO=y
 CONFIG_USB_UHCI=y
 CONFIG_USB_OHCI=y
 CONFIG_USB_EHCI=y
-# CONFIG_USB_XHCI=y
-# CONFIG_USB_XHCI_NEC=y
+CONFIG_USB_XHCI=y
+CONFIG_USB_XHCI_NEC=y
 CONFIG_NE2000_PCI=y
-# CONFIG_EEPRO100_PCI=y
-# CONFIG_PCNET_PCI=y
-# CONFIG_PCNET_COMMON=y
+CONFIG_EEPRO100_PCI=y
+CONFIG_PCNET_PCI=y
+CONFIG_PCNET_COMMON=y
 CONFIG_AC97=y
-# CONFIG_HDA=y
-# CONFIG_ES1370=y
-# CONFIG_LSI_SCSI_PCI=y
-# CONFIG_VMW_PVSCSI_SCSI_PCI=y
-# CONFIG_MEGASAS_SCSI_PCI=y
-# CONFIG_MPTSAS_SCSI_PCI=y
-# CONFIG_RTL8139_PCI=y
-# CONFIG_E1000_PCI=y
-# CONFIG_E1000E_PCI=y
+CONFIG_HDA=y
+CONFIG_ES1370=y
+CONFIG_LSI_SCSI_PCI=y
+CONFIG_VMW_PVSCSI_SCSI_PCI=y
+CONFIG_MEGASAS_SCSI_PCI=y
+CONFIG_MPTSAS_SCSI_PCI=y
+CONFIG_RTL8139_PCI=y
+CONFIG_E1000_PCI=y
+CONFIG_E1000E_PCI=y
 CONFIG_IDE_CORE=y
 CONFIG_IDE_QDEV=y
 CONFIG_IDE_PCI=y
 CONFIG_AHCI=y
-# CONFIG_ESP=y
-# CONFIG_ESP_PCI=y
+CONFIG_ESP=y
+CONFIG_ESP_PCI=y
 CONFIG_SERIAL=y
-# CONFIG_SERIAL_ISA=y
-# CONFIG_SERIAL_PCI=y
-# CONFIG_CAN_BUS=y
-# CONFIG_CAN_SJA1000=y
-# CONFIG_CAN_PCI=y
-# CONFIG_IPACK=y
-# CONFIG_WDT_IB6300ESB=y
-# CONFIG_PCI_TESTDEV=y
-# CONFIG_NVME_PCI=y
-# CONFIG_SD=y
-# CONFIG_SDHCI=y
-# CONFIG_EDU=y
+CONFIG_SERIAL_ISA=y
+CONFIG_SERIAL_PCI=y
+CONFIG_CAN_BUS=y
+CONFIG_CAN_SJA1000=y
+CONFIG_CAN_PCI=y
+CONFIG_IPACK=y
+CONFIG_WDT_IB6300ESB=y
+CONFIG_PCI_TESTDEV=y
+CONFIG_NVME_PCI=y
+CONFIG_SD=y
+CONFIG_SDHCI=y
+CONFIG_EDU=y
 CONFIG_VGA=y
 CONFIG_VGA_PCI=y
-# CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
-# CONFIG_ROCKER=y
-# CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
-# CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
+CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
+CONFIG_ROCKER=y
+CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
+CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
diff --git a/default-configs/usb.mak b/default-configs/usb.mak
index 6cacd3ba0c..f4b85684f0 100644
--- a/default-configs/usb.mak
+++ b/default-configs/usb.mak
@@ -1,10 +1,10 @@
 CONFIG_USB=y
-# CONFIG_USB_TABLET_WACOM=y
-# CONFIG_USB_STORAGE_BOT=y
-# CONFIG_USB_STORAGE_UAS=y
-# CONFIG_USB_STORAGE_MTP=y
-# CONFIG_USB_SMARTCARD=y
-# CONFIG_USB_AUDIO=y
-# CONFIG_USB_SERIAL=y
-# CONFIG_USB_NETWORK=y
-# CONFIG_USB_BLUETOOTH=y
+CONFIG_USB_TABLET_WACOM=y
+CONFIG_USB_STORAGE_BOT=y
+CONFIG_USB_STORAGE_UAS=y
+CONFIG_USB_STORAGE_MTP=y
+CONFIG_USB_SMARTCARD=y
+CONFIG_USB_AUDIO=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_NETWORK=y
+CONFIG_USB_BLUETOOTH=y