diff --git a/libnxwidgets/include/clistbox.hxx b/libnxwidgets/include/clistbox.hxx
index 07a6296e8..f6c774abd 100644
--- a/libnxwidgets/include/clistbox.hxx
+++ b/libnxwidgets/include/clistbox.hxx
@@ -76,8 +76,8 @@
 
 #include <nuttx/config.h>
 
-#include <stdint.h>
-#include <stdbool.h>
+#include <cstdint>
+#include <cstdbool>
 
 #include <nuttx/nx/nxglib.h>
 
diff --git a/libnxwidgets/include/clistdata.hxx b/libnxwidgets/include/clistdata.hxx
index 81aa1f3f6..da46a6acd 100644
--- a/libnxwidgets/include/clistdata.hxx
+++ b/libnxwidgets/include/clistdata.hxx
@@ -76,8 +76,8 @@
 
 #include <nuttx/config.h>
 
-#include <stdint.h>
-#include <stdbool.h>
+#include <cstdint>
+#include <cstdbool>
 
 #include <nuttx/nx/nxglib.h>
 
diff --git a/libnxwidgets/src/cglyphsliderhorizontal.cxx b/libnxwidgets/src/cglyphsliderhorizontal.cxx
index 0430a541f..b75ff736d 100644
--- a/libnxwidgets/src/cglyphsliderhorizontal.cxx
+++ b/libnxwidgets/src/cglyphsliderhorizontal.cxx
@@ -3,6 +3,7 @@
  *
  *   Copyright (C) 2013 Ken Pettit. All rights reserved.
  *   Author: Ken Pettit <pettitkd@gmail.com>
+ *           Gregory Nutt <gnutt@nuttx.org> (updates to Ken's fundamental work)
  *
  *   Based on and copied from csliderhorizontal.cxx written by Gregory Nutt
  *
diff --git a/libnxwidgets/src/clistbox.cxx b/libnxwidgets/src/clistbox.cxx
index 8d076f3d3..1c5d1e507 100644
--- a/libnxwidgets/src/clistbox.cxx
+++ b/libnxwidgets/src/clistbox.cxx
@@ -462,7 +462,7 @@ void CListBox::drawContents(CGraphicsPort *port)
   nxgl_coord_t clipY      = rect.getY();
   nxgl_coord_t clipHeight = rect.getHeight();
 
-  // Precalc values for option draw loop
+  // Precalculate values for option draw loop
 
   nxgl_coord_t optionHeight = getOptionHeight();
 
@@ -607,7 +607,7 @@ void CListBox::onClick(nxgl_coord_t x, nxgl_coord_t y)
   const CListBoxDataItem *item =
     (const CListBoxDataItem*)m_options.getItem(m_lastSelectedIndex);
 
-  // Are we setting or unsetting?
+  // Are we selecting or de-selecting?
 
   if (item->isSelected())
     {
diff --git a/libnxwidgets/src/clistboxdataitem.cxx b/libnxwidgets/src/clistboxdataitem.cxx
index 22a9323bb..01c544b5f 100644
--- a/libnxwidgets/src/clistboxdataitem.cxx
+++ b/libnxwidgets/src/clistboxdataitem.cxx
@@ -73,8 +73,8 @@
 
 #include <nuttx/config.h>
 
-#include <stdint.h>
-#include <stdbool.h>
+#include <cstdint>
+#include <cstdbool>
 
 #include "cwidgetcontrol.hxx"
 #include "clistboxdataitem.hxx"
diff --git a/libnxwidgets/src/clistdata.cxx b/libnxwidgets/src/clistdata.cxx
index 7a02e3e37..ba825b42d 100644
--- a/libnxwidgets/src/clistdata.cxx
+++ b/libnxwidgets/src/clistdata.cxx
@@ -73,8 +73,8 @@
 
 #include <nuttx/config.h>
 
-#include <stdint.h>
-#include <stdbool.h>
+#include <cstdint>
+#include <cstdbool>
 #include <cstring>
 
 #include "clistdata.hxx"