diff --git a/tests/match.cpp b/tests/match.cpp
index 3e662775bea02e4803951b584869a769357336cf..15b0790a5d2b59f3648dc06bf760a367d9b4ed1a 100644
--- a/tests/match.cpp
+++ b/tests/match.cpp
@@ -5,9 +5,7 @@
 #include <libwccl/sentencecontext.h>
 #include <libwccl/variables.h>
 
-#include <libwccl/values/tokenmatch.h>
-#include <libwccl/values/annotationmatch.h>
-#include <libwccl/values/matchvector.h>
+#include <libwccl/values/match.h>
 
 #include <libwccl/variables.h>
 
diff --git a/tests/values.cpp b/tests/values.cpp
index 837e1e2eeeedaff6bae9c92edf986006b935bc77..5b23065fe91ca3b3fc7ebaede4059864dea23dcf 100644
--- a/tests/values.cpp
+++ b/tests/values.cpp
@@ -4,6 +4,8 @@
 
 #include <libwccl/sentencecontext.h>
 #include <libwccl/variables.h>
+#include <libwccl/values/tset.h>
+#include <libwccl/values/strset.h>
 
 #include <iostream>
 
diff --git a/tests/varaccess.cpp b/tests/varaccess.cpp
index dd5d3b09225daea56531965ca9e7247548bd9a16..e16b42bf415c9ba00d2a0cc0e81db315a204841f 100644
--- a/tests/varaccess.cpp
+++ b/tests/varaccess.cpp
@@ -2,6 +2,8 @@
 #include <boost/bind.hpp>
 
 #include <libwccl/variables.h>
+#include <libwccl/values/position.h>
+
 #include <libpwrutils/foreach.h>
 
 #include <iostream>
diff --git a/tests/variables.cpp b/tests/variables.cpp
index 31079d11a28775eebdae8fe777d0724c6415487d..e184fa1bf21c51a871b5ac09971b49d7982a0e01 100644
--- a/tests/variables.cpp
+++ b/tests/variables.cpp
@@ -2,6 +2,7 @@
 #include <boost/bind.hpp>
 
 #include <libwccl/variables.h>
+#include <libwccl/values/position.h>
 
 #include <iostream>