diff --git a/nimble/transport/socket/src/ble_hci_socket.c b/nimble/transport/socket/src/ble_hci_socket.c
index f095d173af..fb4fc75ff0 100644
--- a/nimble/transport/socket/src/ble_hci_socket.c
+++ b/nimble/transport/socket/src/ble_hci_socket.c
@@ -49,9 +49,7 @@
 #include <sys/errno.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#endif
-
-#if MYNEWT_VAL_CHOICE(BLE_SOCK_TYPE, linux_blue)
+#elif MYNEWT_VAL_CHOICE(BLE_SOCK_TYPE, linux_blue)
 #include <sys/errno.h>
 #define BTPROTO_HCI       1
 #define HCI_CHANNEL_RAW	  0
@@ -66,11 +64,11 @@ struct sockaddr_hci {
     unsigned short hci_dev;
     unsigned short hci_channel;
 };
-#endif
-
-#if MYNEWT_VAL_CHOICE(BLE_SOCK_TYPE, nuttx)
+#elif MYNEWT_VAL_CHOICE(BLE_SOCK_TYPE, nuttx)
 #include <errno.h>
 #include <netpacket/bluetooth.h>
+#else
+#error "Invalid HCI socket type"
 #endif
 
 #include <fcntl.h>
diff --git a/nimble/transport/socket/syscfg.yml b/nimble/transport/socket/syscfg.yml
index ebe37b76b5..9f3329c067 100644
--- a/nimble/transport/socket/syscfg.yml
+++ b/nimble/transport/socket/syscfg.yml
@@ -55,7 +55,7 @@ syscfg.defs:
         deprecated: 1
 
     BLE_SOCK_USE_LINUX_BLUE:
-        description: 'Use BLE_SOCK_TYPE:linux_bluez'
+        description: 'Use BLE_SOCK_TYPE:linux_blue'
         value: 0
         deprecated: 1