diff --git a/arch/arm/src/stm32f0l0/stm32_adc.h b/arch/arm/src/stm32f0l0/stm32_adc.h
index 6d3568759c4..a996b092904 100644
--- a/arch/arm/src/stm32f0l0/stm32_adc.h
+++ b/arch/arm/src/stm32f0l0/stm32_adc.h
@@ -44,9 +44,10 @@
 
 #include "chip.h"
 
-#include "hardware/stm32_adc.h"
-
 #include <nuttx/analog/adc.h>
+#include <arch/chip/chip.h>
+
+#include "hardware/stm32_adc.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32f0l0/stm32_dma_v1.c b/arch/arm/src/stm32f0l0/stm32_dma_v1.c
index 495762c3ab9..3ccc0f0bab6 100644
--- a/arch/arm/src/stm32f0l0/stm32_dma_v1.c
+++ b/arch/arm/src/stm32f0l0/stm32_dma_v1.c
@@ -49,6 +49,8 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
+#include <arch/chip/chip.h>
+
 #include "up_arch.h"
 #include "up_internal.h"
 #include "sched/sched.h"
diff --git a/configs/lpcxpresso-lpc54628/README.txt b/configs/lpcxpresso-lpc54628/README.txt
index 1f52d489750..617088f6447 100644
--- a/configs/lpcxpresso-lpc54628/README.txt
+++ b/configs/lpcxpresso-lpc54628/README.txt
@@ -548,6 +548,13 @@ Configurations
         terminal does not receive console input.  NxTerm input is via
         /dev/console.
 
+       NOTE:  Since the NxTerm keyboard input comes directly from /dev/console,
+       it goes to whichever task has an outstanding read on the console
+       device.  That works well if there is only a single NxTerm window.
+       But if there are multiple NxTerm windows, then it is anyone's guess
+       which will receive the keyboard input.  That does not work well in
+       such cases.
+
        Some known bugs yet-to-fixed.  Surely there are more as will be revealed
        by additional testing:
 
diff --git a/graphics/Kconfig b/graphics/Kconfig
index 3190325f685..bff3fc57923 100644
--- a/graphics/Kconfig
+++ b/graphics/Kconfig
@@ -423,6 +423,21 @@ config NXTERM_NXKBDIN
 		by window callback functions so that keyboard input *only* goes to the
 		top window.
 
+		NOTE: nxterm_kdbin() is an internal OS API.  It can be accessed by
+		applications via the boardctl(BOARDIOC_NXTERM) interface.
+
+		The logic path is complex in this case:  (1) The keyboard input is
+		received by an application listener thread and injected into NX via
+		nx_kbdin().  NX sends (2) the keyboard input to single the NX window
+		that has focus.  That window then (3) gives the keyboard input to the
+		single NxTerm associated with the window via boardctl(BOARDIOC_NXTERM).
+
+		NOTE:  If CONFIG_NXTERM_NXKBDIN not defined, then NxTerm input coming
+		directly from /dev/console.  That works well if there is only a single
+		NxTerm window.  But if there are multiple NxTerm windows, then it is
+		anyone's guess which will receive the keyboard input.  That does not
+		work well in such cases.
+
 config NXTERM_KBDBUFSIZE
 	int "Keyboard Input Buffer Size"
 	default 16