Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 9e27f6957789f762b0e85c0513043cdd860c9150)
+++ tests/Makefile.am	(revision 36fbaecac04f5c0f7abac24e5f1e96208002d2ff)
@@ -26,5 +26,5 @@
 archiveerrors=
 
-DEBUG_FLAGS=-debug -O0
+DEBUG_FLAGS=-debug -g -O0
 
 quick_test=avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
@@ -44,4 +44,5 @@
 	-Wall \
 	-Wno-unused-function \
+	-Wno-psabi \
 	-quiet @CFA_FLAGS@
 
Index: tests/include/.expect/includes.nast.txt
===================================================================
--- tests/include/.expect/includes.nast.txt	(revision 9e27f6957789f762b0e85c0513043cdd860c9150)
+++ tests/include/.expect/includes.nast.txt	(revision 36fbaecac04f5c0f7abac24e5f1e96208002d2ff)
@@ -1,4 +1,2 @@
-/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:154:9: note: #pragma message: Compiled
+include/includes.cfa:156:9: note: #pragma message: Compiled
Index: tests/include/includes.cfa
===================================================================
--- tests/include/includes.cfa	(revision 9e27f6957789f762b0e85c0513043cdd860c9150)
+++ tests/include/includes.cfa	(revision 36fbaecac04f5c0f7abac24e5f1e96208002d2ff)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// includes.cfa -- 
+// includes.cfa --
 //
 // Author           : Peter A. Buhr
@@ -90,5 +90,4 @@
 #include <poll.h>
 #include <printf.h>
-#include <proc_service.h>
 #include <pthread.h>
 #include <pty.h>
@@ -122,5 +121,5 @@
 #include <termio.h>
 #include <termios.h>
-#include <term_entry.h>
+// #include <term_entry.h>								// conflicts with search.h on some machines
 #include <tgmath.h>
 //#include <threads.h>									// does not exist
@@ -137,5 +136,8 @@
 #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>
