diff --git a/include/graphics/nxwidgets/cwidgeteventargs.hxx b/include/graphics/nxwidgets/cwidgeteventargs.hxx
index cf197f368..ee625d48a 100644
--- a/include/graphics/nxwidgets/cwidgeteventargs.hxx
+++ b/include/graphics/nxwidgets/cwidgeteventargs.hxx
@@ -127,8 +127,8 @@ namespace NXWidgets
   class CWidgetEventArgs : public TEventArgs<CNxWidget*>
   {
   private:
-    nxgl_coord_t    m_x;   /**< X coordinateinate of the event. */
-    nxgl_coord_t    m_y;   /**< Y coordinateinate of the event. */
+    nxgl_coord_t    m_x;   /**< X coordinate of the event. */
+    nxgl_coord_t    m_y;   /**< Y coordinate of the event. */
     nxgl_coord_t    m_vX;  /**< X distance moved during event, for dragging. */
     nxgl_coord_t    m_vY;  /**< Y distance moved during event, for dragging. */
     nxwidget_char_t m_key; /**< The key code / cursor code that raised the event. */
diff --git a/include/graphics/nxwidgets/cwindoweventhandler.hxx b/include/graphics/nxwidgets/cwindoweventhandler.hxx
index 4c26412be..d957ab9a6 100644
--- a/include/graphics/nxwidgets/cwindoweventhandler.hxx
+++ b/include/graphics/nxwidgets/cwindoweventhandler.hxx
@@ -88,21 +88,19 @@ namespace NXWidgets
 
     virtual void handleGeometryEvent(void) { }
 
+#ifdef CONFIG_NX_XYINPUT
     /**
      * Handle an NX window mouse input event.
-     *
-     * @param e The event data.
      */
 
-#ifdef CONFIG_NX_XYINPUT
     virtual void handleMouseEvent(void) { }
 #endif
 
+#ifdef CONFIG_NX_KBD
     /**
      * Handle a NX window keyboard input event.
      */
 
-#ifdef CONFIG_NX_KBD
     virtual void handleKeyboardEvent(void) { }
 #endif
 
diff --git a/include/graphics/nxwm/chexcalculator.hxx b/include/graphics/nxwm/chexcalculator.hxx
index 4e7118b8f..b57aae4da 100644
--- a/include/graphics/nxwm/chexcalculator.hxx
+++ b/include/graphics/nxwm/chexcalculator.hxx
@@ -44,7 +44,6 @@
 
 #include <sys/types.h>
 #include <nuttx/nx/nxtk.h>
-#include <nuttx/nx/nxterm.h>
 
 #include "graphics/nxwidgets/cbuttonarray.hxx"
 #include "graphics/nxwidgets/clabel.hxx"
@@ -70,7 +69,7 @@
 namespace NxWM
 {
   /**
-   * This class implements the NxTerm application.
+   * This class implements the Hex calculator application.
    */
 
   class CHexCalculator : public  IApplication,
diff --git a/include/graphics/nxwm/cmediaplayer.hxx b/include/graphics/nxwm/cmediaplayer.hxx
index 53d629eb2..8b5aa1484 100644
--- a/include/graphics/nxwm/cmediaplayer.hxx
+++ b/include/graphics/nxwm/cmediaplayer.hxx
@@ -325,6 +325,8 @@ namespace NxWM
     /**
      * Handle a widget release event.  Only the play and pause image release
      * are of interest.
+     *
+     * @param e The event data.
      */
 
     void handleReleaseEvent(const NXWidgets::CWidgetEventArgs &e);
@@ -333,6 +335,8 @@ namespace NxWM
      * Handle a widget release event when the widget WAS dragged outside of
      * its original bounding box.  Only the play and pause image release
      * are of interest.
+     *
+     * @param e The event data.
      */
 
     void handleReleaseOutsideEvent(const NXWidgets::CWidgetEventArgs &e);
@@ -340,6 +344,8 @@ namespace NxWM
     /**
      * Handle value changes.  This will get events when there is a change in the
      * volume level or a file is selected or deselected.
+     *
+     * @param e The event data.
      */
 
     void handleValueChangeEvent(const NXWidgets::CWidgetEventArgs &e);
diff --git a/include/graphics/nxwm/cwindowmessenger.hxx b/include/graphics/nxwm/cwindowmessenger.hxx
index 8d20caccb..7d648e767 100644
--- a/include/graphics/nxwm/cwindowmessenger.hxx
+++ b/include/graphics/nxwm/cwindowmessenger.hxx
@@ -99,21 +99,19 @@ namespace NxWM
     static void inputWorkCallback(FAR void *arg);
     static void destroyWorkCallback(FAR void *arg);
 
+#ifdef CONFIG_NX_XYINPUT
     /**
      * Handle an NX window mouse input event.
-     *
-     * @param e The event data.
      */
 
-#ifdef CONFIG_NX_XYINPUT
     void handleMouseEvent(void);
 #endif
 
+#ifdef CONFIG_NX_KBD
     /**
      * Handle a NX window keyboard input event.
      */
 
-#ifdef CONFIG_NX_KBD
     void handleKeyboardEvent(void);
 #endif
 
@@ -135,7 +133,8 @@ namespace NxWM
      *   values stored in the defaultCWidgetStyle object.
      */
 
-     CWindowMessenger(FAR const NXWidgets::CWidgetStyle *style = (const NXWidgets::CWidgetStyle *)NULL);
+     CWindowMessenger(FAR const NXWidgets::CWidgetStyle *style =
+       (const NXWidgets::CWidgetStyle *)NULL);
 
     /**
      * CWindowMessenger Destructor.