diff --git a/include/errno.h b/include/errno.h
index 08f76e4d32..f215269c73 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -379,11 +379,11 @@
 #define ECANCELED_STR       "Operation cancelled"
 
 /************************************************************************
- * Type Declarations
+ * Public Type Definitions
  ************************************************************************/
 
 /************************************************************************
- * Global Function Prototypes
+ * Public Function Prototypes
  ************************************************************************/
 
 #undef EXTERN
diff --git a/include/mqueue.h b/include/mqueue.h
index 6719cbd42f..b1f2abaea3 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -51,7 +51,7 @@
 #define MQ_NONBLOCK O_NONBLOCK
 
 /********************************************************************************
- * Global Type Declarations
+ * Public Type Declarations
  ********************************************************************************/
 
 /* Message queue attributes */
diff --git a/include/pthread.h b/include/pthread.h
index d65f6d5080..4de07d62a2 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -148,7 +148,7 @@
   prctl((int)PR_GET_NAME, (char*)name, (int)thread)
 
 /********************************************************************************
- * Global Type Declarations
+ * Public Type Definitions
  ********************************************************************************/
 
 #ifdef __cplusplus
@@ -241,11 +241,11 @@ typedef bool pthread_once_t;
 struct sched_param; /* Defined in sched.h */
 
 /********************************************************************************
- * Global Variables
+ * Public Data
  ********************************************************************************/
 
 /********************************************************************************
- * Global Function Prototypes
+ * Public Function Prototypes
  ********************************************************************************/
 
 /* Initializes a thread attributes object (attr) with default values for all of
@@ -414,4 +414,3 @@ int pthread_sigmask(int how, FAR const sigset_t *set, FAR sigset_t *oset);
 #endif
 
 #endif /* __INCLUDE_PTHREAD_H */
-
diff --git a/include/queue.h b/include/queue.h
index 7d10e86e1d..56c87469a7 100644
--- a/include/queue.h
+++ b/include/queue.h
@@ -60,7 +60,7 @@
 #define dq_peek(q)  ((q)->head)
 
 /****************************************************************************
- * Global Type Declarations
+ * Public Type Definitions
  ****************************************************************************/
 
 struct sq_entry_s
@@ -91,7 +91,7 @@ struct dq_queue_s
 typedef struct dq_queue_s dq_queue_t;
 
 /****************************************************************************
- * Global Function Prototypes
+ * Public Function Prototypes
  ****************************************************************************/
 
 #ifdef __cplusplus
diff --git a/include/sched.h b/include/sched.h
index 60b32522ca..4fe16542d6 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -53,7 +53,7 @@
 
 /* POSIX-like scheduling policies */
 
-#define SCHED_FIFO       1  /* FIFO per priority scheduling policy */
+#define SCHED_FIFO       1  /* FIFO priority scheduling policy */
 #define SCHED_RR         2  /* Round robin scheduling policy */
 #define SCHED_SPORADIC   3  /* Sporadic scheduling policy */
 #define SCHED_OTHER      4  /* Not supported */
diff --git a/include/signal.h b/include/signal.h
index 492ce416c0..30f97ef687 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -183,7 +183,7 @@
 #endif
 
 /********************************************************************************
- * Global Type Declarations
+ * Public Type Definitions
  ********************************************************************************/
 
 /* This defines a set of 32 signals (numbered 0 through 31). */
@@ -251,11 +251,11 @@ struct sigaction
 #define sa_sigaction sa_u._sa_sigaction
 
 /********************************************************************************
- * Global Variables
+ * Public Data
  ********************************************************************************/
 
 /********************************************************************************
- * Global Function Prototypes
+ * Public Function Prototypes
  ********************************************************************************/
 
 #ifdef __cplusplus
@@ -297,4 +297,3 @@ int sigqueue(int pid, int signo, FAR void *sival_ptr);
 #endif
 
 #endif /* __INCLUDE_SIGNAL_H */
-
diff --git a/include/stdlib.h b/include/stdlib.h
index 14b06f88ae..70e9f707e7 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -49,9 +49,9 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* The C standard specifies two constants, EXIT_SUCCESS and
- * EXIT_FAILURE, that may be passed to exit() to indicate
- * successful or unsucessful termination, respectively.
+/* The C standard specifies two constants, EXIT_SUCCESS and EXIT_FAILURE,
+ * that may be passed to exit() to indicate successful or unsuccessful
+ * termination, respectively.
  */
 
 #define EXIT_SUCCESS 0
@@ -71,9 +71,8 @@
 
 #define MB_CUR_MAX 1
 
-/* The environ variable, normally 'extern char **environ;' is
- * not implemented as a function call.  However, get_environ_ptr()
- * can be used in its place.
+/* The environ variable, normally 'char **environ;' is not implemented as a
+ * function call.  However, get_environ_ptr() can be used in its place.
  */
 
 #ifndef CONFIG_DISABLE_ENVIRON
@@ -81,7 +80,7 @@
 #endif
 
 /****************************************************************************
- * Global Type Definitions
+ * Public Type Definitions
  ****************************************************************************/
 
 struct mallinfo
@@ -97,11 +96,7 @@ struct mallinfo
 };
 
 /****************************************************************************
- * Global Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Global Function Prototypes
+ * Public Function Prototypes
  ****************************************************************************/
 
 #undef EXTERN
diff --git a/include/string.h b/include/string.h
index 79849e4a96..396f440872 100644
--- a/include/string.h
+++ b/include/string.h
@@ -56,7 +56,7 @@
 #define bcopy(b1,b2,len) (void)memmove(b2,b1,len)
 
 /****************************************************************************
- * Global Function Prototypes
+ * Public Function Prototypes
  ****************************************************************************/
 
 #undef EXTERN
diff --git a/include/unistd.h b/include/unistd.h
index 7816fb36c3..e482109f5c 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -113,7 +113,7 @@
 #define HOST_NAME_MAX 32
 
 /****************************************************************************
- * Global Variables
+ * Public Data
  ****************************************************************************/
 
 #undef EXTERN
@@ -133,7 +133,7 @@ extern "C"
 #ifndef __NXFLAT__
 EXTERN FAR char *optarg; /* Optional argument following option */
 EXTERN int       optind; /* Index into argv */
-EXTERN int       optopt; /* unrecognized option character */
+EXTERN int       optopt; /* Unrecognized option character */
 #else
 #  define optarg  (*(getoptargp()))
 #  define optind  (*(getoptindp()))
@@ -141,7 +141,7 @@ EXTERN int       optopt; /* unrecognized option character */
 #endif
 
 /****************************************************************************
- * Global Function Prototypes
+ * Public Function Prototypes
  ****************************************************************************/
 
 /* Task Control Interfaces */
@@ -205,7 +205,7 @@ int     getopt(int argc, FAR char *const argv[], FAR const char *optstring);
 
 FAR char **getoptargp(void); /* Optional argument following option */
 int       *getoptindp(void); /* Index into argv */
-int       *getoptoptp(void); /* unrecognized option character */
+int       *getoptoptp(void); /* Unrecognized option character */
 
 #ifdef CONFIG_NET
 int     gethostname(FAR char *name, size_t size);