diff --git a/NEWS b/NEWS
index 1c4e87574..b0bf094a8 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,10 @@ New in spot 2.2.1.dev (Not yet released)
     everything that was not Inf was Fin.  These errors are now
     diagnosed.
 
+  * Some of the installed headers (spot/misc/fixpool.hh,
+    spot/misc/mspool.hh, spot/twaalgos/emptiness_stats.hh) were not
+    self-contained.
+
 New in spot 2.2.1 (2016-11-21)
 
   Bug fix:
diff --git a/spot/misc/common.hh b/spot/misc/common.hh
index e5d062883..aad010a99 100644
--- a/spot/misc/common.hh
+++ b/spot/misc/common.hh
@@ -19,6 +19,7 @@
 
 #include <cstdlib>
 #include <stdexcept>
+#include <cassert>
 
 #pragma once
 
diff --git a/spot/misc/fixpool.hh b/spot/misc/fixpool.hh
index 0779d7171..81c4393db 100644
--- a/spot/misc/fixpool.hh
+++ b/spot/misc/fixpool.hh
@@ -19,10 +19,10 @@
 
 #pragma once
 
+#include <spot/misc/common.hh>
 #include <new>
 #include <cstddef>
 #include <cstdlib>
-#include <cassert>
 
 namespace spot
 {
diff --git a/spot/misc/mspool.hh b/spot/misc/mspool.hh
index 600ed84e4..eb827ff27 100644
--- a/spot/misc/mspool.hh
+++ b/spot/misc/mspool.hh
@@ -19,11 +19,11 @@
 
 #pragma once
 
+#include <spot/misc/common.hh>
+#include <spot/misc/hash.hh>
 #include <new>
 #include <cstddef>
 #include <cstdlib>
-#include <cassert>
-#include <spot/misc/hash.hh>
 
 namespace spot
 {
diff --git a/spot/twaalgos/emptiness_stats.hh b/spot/twaalgos/emptiness_stats.hh
index fb8feefc7..0e52e6085 100644
--- a/spot/twaalgos/emptiness_stats.hh
+++ b/spot/twaalgos/emptiness_stats.hh
@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <cassert>
-#include <map>
+#include <spot/misc/common.hh>
 #include <spot/misc/ltstr.hh>
+#include <map>
 
 namespace spot
 {
diff --git a/tests/run.in b/tests/run.in
index 1d8066fd5..77263f8f9 100755
--- a/tests/run.in
+++ b/tests/run.in
@@ -52,6 +52,15 @@ srcdir="@srcdir@"
 # want to inherit parameters likes -std=c11 -fvisibility=hidden
 CFLAGS=
 export CFLAGS
+CXX='@CXX@'
+export CXX
+CXXFLAGS='@CXXFLAGS@'
+export CXXFLAGS
+top_builddir='@abs_top_builddir@'
+export top_builddir
+top_srcdir='@abs_top_srcdir@'
+export top_srcdir
+
 
 case $1 in
     */*)
diff --git a/tests/sanity/includes.test b/tests/sanity/includes.test
index a37e1b3d8..bbcf29b89 100755
--- a/tests/sanity/includes.test
+++ b/tests/sanity/includes.test
@@ -27,7 +27,6 @@ set -e
 
 rm -f failures.inc
 
-
 INCDIR=${srcdir-.}/../../spot
 
 for file in `find "$INCDIR" \( -name "${1-*}.hh" \
@@ -36,21 +35,30 @@ for file in `find "$INCDIR" \( -name "${1-*}.hh" \
 
    if head -n 100 "$INCDIR/$file" | grep -q "[	 ]*#.*pragma.* once\$"; then
      :
-   elif grep -q 'GNU Bison 2\.6' "$INCDIR/$file"; then
-     # Bison 2.6, 2.6.1, 2.6.2 have a bug where position.hh
-     # include <iosfwd> instead of <iostream>.
+   elif grep -q 'made by GNU Bison' "$INCDIR/$file"; then
+     # Those are not public headers, so we do not care
      continue
-   elif grep -q 'GNU Bison' "$INCDIR/$file"; then
-     :
    else
      echo "Missing, or incorrect include guard." >&2
      echo "FAIL: $file"
      echo "  $file" >> failures.inc
      continue
    fi
-   echo "PASS: $file"
+
+   echo "#include <spot/$file>" >incltest.cc
+
+   if $CXX $CPPFLAGS -DSKIP_DEPRECATED_WARNING $CXXFLAGS \
+           -I$top_builddir -I$top_srcdir -I$top_srcdir/buddy/src \
+           -c incltest.cc; then
+      echo "PASS: $file"
+   else
+      echo "FAIL: $file"
+      echo "  $file" >> failures.inc
+   fi
 done
 
+rm -f incltest.cc incltest.o
+
 if test -f failures.inc; then
    echo "Failed files:"
    cat failures.inc