Index: tests/.expect/Includes.nast.txt
===================================================================
--- tests/.expect/Includes.nast.txt	(revision 097d3e1a4717900e63a147c254f243100c769ce3)
+++ tests/.expect/Includes.nast.txt	(revision 097d3e1a4717900e63a147c254f243100c769ce3)
@@ -0,0 +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
+Includes.cfa: In function '_X4mainFi_iPPKc__1':
+Includes.cfa:186:9: note: #pragma message: Compiled
Index: tests/Includes.cfa
===================================================================
--- tests/Includes.cfa	(revision 097d3e1a4717900e63a147c254f243100c769ce3)
+++ tests/Includes.cfa	(revision 097d3e1a4717900e63a147c254f243100c769ce3)
@@ -0,0 +1,190 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// includes.c -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Wed May 27 17:56:53 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Feb 21 19:03:01 2021
+// Update Count     : 685
+//
+
+#ifdef __CFA__
+extern "C" {
+#endif // __CFA__
+
+//#define _GNU_SOURCE
+//#include <FlexLexer.h>
+#include <aio.h>
+#include <aliases.h>
+#include <alloca.h>
+#include <ar.h>
+#include <argp.h>
+#include <argz.h>
+#include <assert.h>
+#include <byteswap.h>
+#include <complex.h>
+#include <cpio.h>
+#include <crypt.h>
+#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>
+#include <endian.h>
+#include <envz.h>
+#include <err.h>
+#include <errno.h>
+#include <error.h>
+#include <eti.h>
+//#include <etip.h>
+#include <execinfo.h>
+#include <expat.h>
+#include <expat_external.h>
+#include <fcntl.h>
+#include <features.h>
+#include <fenv.h>
+#include <fmtmsg.h>
+#include <fnmatch.h>
+#include <form.h>
+#include <fstab.h>
+#include <fts.h>
+#include <ftw.h>
+#include <sys/types.h>
+//#include <gawkapi.h>									// CFA bug #240 nested anonymous enum fails
+#include <gconv.h>
+#include <getopt.h>
+#include <glob.h>
+//#include <gmpxx.h>
+#include <gnumake.h>
+#include <gnu-versions.h>
+#include <grp.h>
+#include <gshadow.h>
+#include <iconv.h>
+#include <ifaddrs.h>
+#include <inttypes.h>
+#include <langinfo.h>
+#include <lastlog.h>
+#include <libgen.h>
+#include <libintl.h>
+#include <limits.h>
+//#include <link.h>										// CFA bug #240 nested anonymous enum fails
+#include <locale.h>
+//#include <ltdl.h>
+#include <lzma.h>
+//#include <malloc.h>										// CFA #include_next
+#include <math.h>
+#include <mcheck.h>
+#include <memory.h>
+#include <menu.h>
+#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>
+#include <nss.h>
+#include <obstack.h>
+#include <panel.h>
+#include <paths.h>
+#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>
+#include <sched.h>
+#include <search.h>
+#include <semaphore.h>
+#include <setjmp.h>
+#include <sgtty.h>
+#include <shadow.h>
+#include <signal.h>
+#include <spawn.h>
+#include <stab.h>
+#include <stdc-predef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdio_ext.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <sudo_plugin.h>
+#include <syscall.h>
+#include <sysexits.h>
+#include <syslog.h>
+#include <tar.h>
+#include <term.h>
+#include <termcap.h>
+#include <termio.h>
+#include <termios.h>
+#include <term_entry.h>
+#include <tgmath.h>
+#include <threads.h>
+#include <thread_db.h>
+//#include <tic.h>
+#include <time.h>
+#include <ttyent.h>
+#include <uchar.h>
+#include <ucontext.h>
+#include <ulimit.h>
+#include <unctrl.h>
+#include <unistd.h>
+#include <utime.h>
+#include <utmp.h>
+#include <utmpx.h>
+#include <values.h>
+#include <wait.h>
+#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
+#endif // 0
+
+#ifdef __CFA__
+} // extern "C"
+#endif // __CFA__
+
+int main( int argc, char const *argv[] ) {
+	#pragma message( "Compiled" )						// force non-empty .expect file
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa includes.c" //
+// End: //
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 258a8ae310b4bcab699e01ad2f0ef28d7a9b2475)
+++ tests/Makefile.am	(revision 097d3e1a4717900e63a147c254f243100c769ce3)
@@ -11,6 +11,6 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sun Feb 21 15:56:19 2021
-## Update Count     : 87
+## Last Modified On : Sun Feb 21 19:04:09 2021
+## Update Count     : 88
 ###############################################################################
 
@@ -170,5 +170,5 @@
 
 SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator forall \
-	init1 limits nested-types stdincludes cast labelledExit array quasiKeyword builtins/sync warnings/self-assignment
+	init1 limits nested-types stdincludes cast labelledExit array quasiKeyword Includes builtins/sync warnings/self-assignment
 $(SYNTAX_ONLY_CODE): % : %.cfa $(CFACCBIN)
 	$(CFACOMPILE_SYNTAX)
Index: sts/zombies/includes.c
===================================================================
--- tests/zombies/includes.c	(revision 258a8ae310b4bcab699e01ad2f0ef28d7a9b2475)
+++ 	(revision )
@@ -1,250 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// includes.c -- 
-//
-// Author           : Peter A. Buhr
-// Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep 30 13:59:18 2020
-// Update Count     : 598
-//
-
-// ***********************************************
-// USE -std=c99 WITH gxx TO GET SAME OUTPUT AS cfa
-// ***********************************************
-
-#ifdef __CFA__
-extern "C" {
-#endif // __CFA__
-
-#if 1
-#define _GNU_SOURCE
-// #include <a.out.h>
-// #include <aio.h>
-// #include <aliases.h>
-// #include <alloca.h>
-// #include <ansidecl.h>
-// #include <ar.h>
-// #include <argp.h>
-// #include <argz.h>
-// #include <assert.h>
-// #include <bfd.h>
-// #include <bfdlink.h>									// keyword with
-// #include <byteswap.h>
-// #include <bzlib.h>
-// #include <cblas.h>
-// #include <cblas_f77.h>
-// #include <complex.h>
-// #include <com_err.h>
-// #include <cpio.h>
-
-// #include <crypt.h>
-// #include <ctype.h>
-// #include <curses.h>
-// #include <dialog.h>
-// #include <dirent.h>
-// #include <dis-asm.h>
-// #include <dlfcn.h>
-// #include <dlg_colors.h>
-// #include <dlg_config.h>
-// #include <dlg_keys.h>
-// #include <elf.h>
-// #include <endian.h>
-// #include <envz.h>
-// #include <err.h>
-// #include <errno.h>
-// #include <error.h>
-// #include <eti.h>
-// #include <evdns.h>
-// #include <event.h>
-
-// #include <evhttp.h>
-// #include <sys/queue.h>
-// #include <evrpc.h>										// evrpc.h depends on sys/queue.h
-// #include <evutil.h>
-// #include <execinfo.h>
-// #include <expat.h>
-// #include <expat_config.h>
-// #include <expat_external.h>
-// #include <fcntl.h>
-// #include <features.h>
-// #include <fenv.h>
-// #include <fmtmsg.h>
-// #include <fnmatch.h>
-// #include <form.h>
-// #include <fpu_control.h>
-// #include <fstab.h>
-// #include <fts.h>
-// #include <ftw.h>
-
-// #include <gconv.h>
-// #include <getopt.h>
-// #include <gettext-po.h>
-// #include <glob.h>
-// #include <gmp.h>
-// #include <gnu-versions.h>
-// #include <grp.h>
-// #include <gshadow.h>
-// #include <gssapi.h>
-#include <hwloc.h>										// keyword thread (setjmp)
-// #include <iconv.h>
-// #include <idna.h>
-// #include <idn-free.h>
-// #include <idn-int.h>
-// #include <idn-int.h>
-// #include <ifaddrs.h>
-// #include <inttypes.h>
-// #include <jerror.h>
-
-//#include <jmorecfg.h>
-//#include <jpegint.h>
-// #include <jpeglib.h>
-// #include <kdb.h>
-// #include <krb5.h>					// keyword enable
-// #include <langinfo.h>
-// #include <lastlog.h>
-// #include <lber.h>
-// #include <lber_types.h>
-// #include <ldap.h>
-// #include <ldap_cdefs.h>
-// #include <ldap_features.h>
-// #include <ldap_schema.h>
-// #include <ldap_utf8.h>
-// #include <ldif.h>
-// #include <libgen.h>
-// #include <libintl.h>
-// #include <libio.h>
-// #include <libtasn1.h>
-// #include <libudev.h>
-// #include <limits.h>
-// #include <link.h>
-// #include <locale.h>
-// #include <ltdl.h>
-// #include <lzma.h>
-// #include <malloc.h>
-// #include <math.h>
-// #include <mcheck.h>
-// #include <memory.h>
-// #include <menu.h>
-// #include <mntent.h>
-// #include <monetary.h>
-// #include <mqueue.h>
-// #include <ncurses.h>
-// #include <ncurses_dll.h>
-// #include <nc_tparm.h>
-// #include <netdb.h>
-// #include <nl_types.h>
-// #include <nss.h>
-// #include <numa.h>
-// #include <numacompat1.h>
-// #include <numaif.h>
-// #include <obstack.h>
-// #include <panel.h>
-// #include <paths.h>
-// #include <pciaccess.h>
-// #include <pcre.h>
-// //#include <pcreposix.h>			// conflicts with regex.h
-// #include <plugin-api.h>
-// #include <png.h>										// setjmp
-// #include <pngconf.h>									// setjmp
-// #include <poll.h>
-// #include <pr29.h>
-// #include <printf.h>
-// #include <profile.h>
-// #include <pthread.h>									// setjmp
-// #include <pty.h>
-// #include <punycode.h>
-// #include <pwd.h>
-// #define INIT ;						// needed for regex.h
-// #define GETC() 'a'
-// #define PEEKC() 'a'
-// #define UNGETC( c ) ;
-// #define RETURN( ptr ) ;
-// #define ERROR( val ) ;
-// #include <regex.h>
-// //#include <regexp.h>				// GNU C Library no longer implements
-// #include <resolv.h>
-// #include <re_comp.h>
-// #include <sched.h>
-// #include <search.h>
-// #include <semaphore.h>
-// #include <setjmp.h>
-// #include <sgtty.h>
-// #include <shadow.h>
-// #include <signal.h>
-// #include <spawn.h>
-// #include <stab.h>
-// #include <stdatomic.h>
-// #include <stdarg.h>
-// #include <stdbool.h>
-// #include <stdint.h>
-// #include <stddef.h>
-// #include <stdio.h>
-// #include <stdio_ext.h>
-// #include <stdlib.h>
-// #include <string.h>
-// #include <stringprep.h>
-// #include <strings.h>
-// #include <stropts.h>
-// #include <sudo_plugin.h>
-// #include <symcat.h>
-// #include <syscall.h>
-// #include <sysexits.h>
-// #include <syslog.h>
-// #include <tar.h>
-// #include <term.h>
-// #include <termcap.h>
-// #include <termio.h>
-// #include <termios.h>
-// //#include <term_entry.h>
-// #include <tgmath.h>
-// #include <thread_db.h>			// CFA bug
-// #include <tic.h>
-// #include <time.h>
-// #include <tld.h>
-// #include <ttyent.h>
-// #include <turbojpeg.h>
-// #include <ucontext.h>
-// #include <ulimit.h>
-// #include <unctrl.h>
-// #include <unistd.h>
-// #include <ustat.h>
-// #include <utime.h>
-// #include <utmp.h>
-// #include <utmpx.h>
-// #include <wait.h>
-// #include <wchar.h>
-// #include <wctype.h>
-// #include <wordexp.h>
-// #include <xlocale.h>
-// #include <values.h>
-// #include <zconf.h>
-// #include <zlib.h>
-// #include <_G_config.h>
-
-// #include <jpeglib.h>				// after stdlib.h/stdio.h
-// #include <jpegint.h>
-// #include <jmorecfg.h>
-#if 0
-#endif // 0
-
-#else
-
-#define _GNU_SOURCE
-
-#include <setjmp.h>
-
-#endif // 0
-
-#ifdef __CFA__
-} // extern "C"
-#endif // __CFA__
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa includes.c" //
-// End: //