diff --git a/examples/nxflat/tests/task/task.c b/examples/nxflat/tests/task/task.c
index f543dc19b..e77dc8875 100644
--- a/examples/nxflat/tests/task/task.c
+++ b/examples/nxflat/tests/task/task.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/examples/nxflat/tests/task/parent.c
+ * apps/examples/nxflat/tests/task/task.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -47,9 +47,10 @@ static char no_name[] = "<noname>";
  * Privite Functions
  ****************************************************************************/
 
-/* NOTE: it is necessary for functions that are referred to by function pointers
- * pointer to be declared with global scope (at least for ARM).  Otherwise,
- * a relocation type that is not supported by NXFLAT is generated by GCC.
+/* NOTE: it is necessary for functions that are referred to by function
+ * pointers pointer to be declared with global scope (at least for ARM).
+ * Otherwise, a relocation type that is not supported by
+ * NXFLAT is generated by GCC.
  */
 
 int child_task(int argc, char **argv)
@@ -113,7 +114,8 @@ int main(int argc, char **argv)
 
   child_argv[0] = child_arg;
   child_argv[1] = 0;
-  child_pid = task_create(child_name, 50, 512, child_task, (FAR char * const *)child_argv);
+  child_pid = task_create(child_name, 50, 512,
+                          child_task, (FAR char * const *)child_argv);
   if (child_pid < 0)
     {
       printf("Parent: task_create failed: %d\n", errno);
diff --git a/graphics/nxwidgets/UnitTests/CButton/Makefile b/graphics/nxwidgets/UnitTests/CButton/Makefile
index 7206bb7f8..54695133e 100644
--- a/graphics/nxwidgets/UnitTests/CButton/Makefile
+++ b/graphics/nxwidgets/UnitTests/CButton/Makefile
@@ -1,5 +1,5 @@
 #################################################################################
-# apps/graphics/nxwidgets/UniTests/CButton/Makefile
+# apps/graphics/nxwidgets/UnitTests/CButton/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/graphics/pdcurs34/pdcurses/Make.defs b/graphics/pdcurs34/pdcurses/Make.defs
index d8ebe865b..5d6a8ccf5 100644
--- a/graphics/pdcurs34/pdcurses/Make.defs
+++ b/graphics/pdcurs34/pdcurses/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/graphics/pdcurs34/Make.defs
+# apps/graphics/pdcurs34/pdcurses/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/WASI-SDK.defs b/tools/WASI-SDK.defs
index 55a258e7b..1bbb3a6b6 100644
--- a/tools/WASI-SDK.defs
+++ b/tools/WASI-SDK.defs
@@ -1,4 +1,3 @@
-
 ############################################################################
 # apps/tools/WASI-SDK.defs
 #
diff --git a/wireless/CMakeLists.txt b/wireless/CMakeLists.txt
index b0962a4ec..bf1036719 100644
--- a/wireless/CMakeLists.txt
+++ b/wireless/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/wireless/wapi/CMakeLists.txt
+# apps/wireless/CMakeLists.txt
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for