Index: tests/include/.expect/includes.nast.txt
===================================================================
--- tests/include/.expect/includes.nast.txt	(revision c14d91aa6fd0e52d8385f3dfcc3fa1f7b32158e6)
+++ tests/include/.expect/includes.nast.txt	(revision e6bb6671f3e21d9c8f117ca5b642aa266df212e8)
@@ -1,1 +1,1 @@
-include/includes.cfa:153:25: warning: Compiled
+include/includes.cfa:169:25: warning: Compiled
Index: tests/include/includes.cfa
===================================================================
--- tests/include/includes.cfa	(revision c14d91aa6fd0e52d8385f3dfcc3fa1f7b32158e6)
+++ tests/include/includes.cfa	(revision e6bb6671f3e21d9c8f117ca5b642aa266df212e8)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  3 22:06:07 2022
-// Update Count     : 774
+// Last Modified On : Tue May 10 16:36:44 2022
+// Update Count     : 776
 //
 
@@ -32,5 +32,7 @@
 #include <crypt.h>
 #include <ctype.h>
-//#include <curses.h>										// may not be installed
+#if __has_include( "curses.h" )
+#include <curses.h>										// may not be installed
+#endif
 #include <dirent.h>
 #include <dlfcn.h>
@@ -41,5 +43,7 @@
 #include <errno.h>
 #include <error.h>
-//#include <eti.h>										// may not be installed, comes with ncurses
+#if __has_include( "eti.h" )
+#include <eti.h>										// may not be installed, comes with ncurses
+#endif
 #include <execinfo.h>
 #include <expat.h>
@@ -50,5 +54,7 @@
 #include <fmtmsg.h>
 #include <fnmatch.h>
-//#include <form.h>										// may not be installed, comes with ncurses
+#if __has_include( "form.h" )
+#include <form.h>										// may not be installed, comes with ncurses
+#endif
 #include <fstab.h>
 #include <fts.h>
@@ -78,14 +84,20 @@
 #include <mcheck.h>
 #include <memory.h>
-//#include <menu.h>										// may not be installed, comes with ncurses
+#if __has_include( "menu.h" )
+#include <menu.h>										// may not be installed, comes with ncurses
+#endif
 #include <mntent.h>
 #include <monetary.h>
 #include <mqueue.h>
-//#include <ncurses_dll.h>								// may not be installed, comes with ncurses
+#if __has_include( "ncurses_dll.h" )
+#include <ncurses_dll.h>								// may not be installed, comes with ncurses
+#endif
 #include <netdb.h>
 #include <nl_types.h>
 #include <nss.h>
 #include <obstack.h>
-//#include <panel.h>										// may not be installed, comes with ncurses
+#if __has_include( "panel.h" )
+#include <panel.h>										// may not be installed, comes with ncurses
+#endif
 #include <paths.h>
 #include <poll.h>
@@ -118,6 +130,8 @@
 #include <syslog.h>
 #include <tar.h>
-//#include <term.h>										// may not be installed, comes with ncurses
-//#include <termcap.h>									// may not be installed, comes with ncurses
+#if __has_include( "term.h" )
+#include <term.h>										// may not be installed, comes with ncurses
+#include <termcap.h>									// may not be installed, comes with ncurses
+#endif
 #include <termio.h>
 #include <termios.h>
@@ -131,5 +145,7 @@
 #include <ucontext.h>
 #include <ulimit.h>
-//#include <unctrl.h>										// may not be installed, comes with ncurses
+#if __has_include( "unctrl.h" )
+#include <unctrl.h>										// may not be installed, comes with ncurses
+#endif
 #include <unistd.h>
 #include <utime.h>