Index: tests/include/.expect/includes.nast.txt
===================================================================
--- tests/include/.expect/includes.nast.txt	(revision 50d8d4da20d6d81e73415309c28285f6edb2209f)
+++ tests/include/.expect/includes.nast.txt	(revision 5f39135edcd5cb0479e079180b47998dcbb43839)
@@ -1,2 +1,4 @@
+/usr/include/x86_64-linux-gnu/bits/socket.h: In function '_X16_operator_assignFS7cmsghdr_S7cmsghdrS7cmsghdr_autogen___1':
+/usr/include/x86_64-linux-gnu/bits/socket.h:285:44: note: the ABI of passing struct with a flexible array member has changed in GCC 4.4
 include/includes.cfa: In function '_X4mainFi_iPPKc__1':
-include/includes.cfa:156:9: note: #pragma message: Compiled
+include/includes.cfa:186:9: note: #pragma message: Compiled
Index: tests/include/includes.cfa
===================================================================
--- tests/include/includes.cfa	(revision 50d8d4da20d6d81e73415309c28285f6edb2209f)
+++ tests/include/includes.cfa	(revision 5f39135edcd5cb0479e079180b47998dcbb43839)
@@ -5,11 +5,11 @@
 // file "LICENCE" distributed with Cforall.
 //
-// includes.cfa --
+// Includes.cfa -- 
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 15 14:13:01 2021
-// Update Count     : 747
+// Last Modified On : Tue Mar  2 15:03:40 2021
+// Update Count     : 690
 //
 
@@ -19,4 +19,5 @@
 
 //#define _GNU_SOURCE
+//#include <FlexLexer.h>
 #include <aio.h>
 #include <aliases.h>
@@ -32,7 +33,14 @@
 #include <ctype.h>
 #include <curses.h>
+//#include <cursesapp.h>
+//#include <cursesf.h>
+//#include <cursesm.h>
+//#include <cursesp.h>
+//#include <cursesw.h>
+//#include <cursslk.h>
 #include <dirent.h>
 #include <dlfcn.h>
 #include <elf.h>
+//#include <emacs-module.h>								// may not be installed
 #include <endian.h>
 #include <envz.h>
@@ -41,6 +49,7 @@
 #include <error.h>
 #include <eti.h>
+//#include <etip.h>
 #include <execinfo.h>
-#include <expat.h>
+//#include <expat.h>										// 32-bit attribute-location problem
 #include <expat_external.h>
 #include <fcntl.h>
@@ -58,4 +67,5 @@
 #include <getopt.h>
 #include <glob.h>
+//#include <gmpxx.h>
 #include <gnumake.h>
 #include <gnu-versions.h>
@@ -72,6 +82,7 @@
 //#include <link.h>										// CFA bug #240 nested anonymous enum fails
 #include <locale.h>
-#include <ltdl.h>
-//#include <malloc.h>									// cannot include in extern "C" because of CFA #include_next
+//#include <ltdl.h>
+//#include <lzma.h>										// may not be installed
+//#include <malloc.h>										// CFA #include_next
 #include <math.h>
 #include <mcheck.h>
@@ -80,6 +91,9 @@
 #include <mntent.h>
 #include <monetary.h>
+#include <mpath_cmd.h>
+#include <mpath_persist.h>
 #include <mqueue.h>
 #include <ncurses_dll.h>
+//#include <nc_tparm.h>
 #include <netdb.h>
 #include <nl_types.h>
@@ -90,8 +104,10 @@
 #include <poll.h>
 #include <printf.h>
+#include <proc_service.h>
 #include <pthread.h>
 #include <pty.h>
 #include <pwd.h>
 #include <regex.h>
+//#include <regexp.h>
 #include <resolv.h>
 #include <re_comp.h>
@@ -121,8 +137,9 @@
 #include <termio.h>
 #include <termios.h>
-// #include <term_entry.h>								// conflicts with search.h on some machines
+#include <term_entry.h>
 #include <tgmath.h>
-//#include <threads.h>									// does not exist
+#include <threads.h>
 #include <thread_db.h>
+//#include <tic.h>
 #include <time.h>
 #include <ttyent.h>
@@ -136,11 +153,24 @@
 #include <utmpx.h>
 #include <values.h>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wattributes"
 #include <wait.h>
-#pragma GCC diagnostic pop
 #include <wchar.h>
 #include <wctype.h>
 #include <wordexp.h>
+#include <z3.h>
+//#include <z3++.h>
+#include <z3_algebraic.h>
+#include <z3_api.h>
+#include <z3_ast_containers.h>
+#include <z3_fixedpoint.h>
+#include <z3_fpa.h>
+#include <z3_macros.h>
+#include <z3_optimization.h>
+#include <z3_polynomial.h>
+#include <z3_rcf.h>
+#include <z3_spacer.h>
+//#include <z3_v1.h>
+#include <z3_version.h>
+#include <zconf.h>
+#include <zlib.h>
 
 #if 0
@@ -157,4 +187,4 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa includes.cfa" //
+// compile-command: "cfa Includes.cfa" //
 // End: //