diff --git a/validate/Makefile.am b/validate/Makefile.am
index 569b67921a..a035b92dd7 100644
--- a/validate/Makefile.am
+++ b/validate/Makefile.am
@@ -22,7 +22,9 @@ supps_DATA = \
 
 EXTRA_DIST = \
 	ChangeLog autogen.sh depcomp \
-	COPYING
+	COPYING \
+	common/gst.supp \
+	data/gstvalidate.supp
 
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
diff --git a/validate/data/Makefile.am b/validate/data/Makefile.am
index d3709bc6af..cc7321a230 100644
--- a/validate/data/Makefile.am
+++ b/validate/data/Makefile.am
@@ -3,3 +3,5 @@ SUBDIRS = scenarios
 configdir=${datadir}/gstreamer-$(GST_API_VERSION)/validate/
 config_DATA = \
 	valgrind.config
+
+EXTRA_DIST = valgrind.config
diff --git a/validate/docs/plugins/Makefile.am b/validate/docs/plugins/Makefile.am
index 9a2f47ebff..4986c2c2bc 100644
--- a/validate/docs/plugins/Makefile.am
+++ b/validate/docs/plugins/Makefile.am
@@ -56,8 +56,7 @@ GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
 
 # If you need to override some of the declarations, place them in this file
 # and uncomment this line.
-#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt
-DOC_OVERRIDES =
+DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt
 
 include $(top_srcdir)/common/gtk-doc.mak
 
diff --git a/validate/docs/plugins/gst-validate-plugins-overrides.txt b/validate/docs/plugins/gst-validate-plugins-overrides.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/validate/tools/Makefile.am b/validate/tools/Makefile.am
index a650700fc1..bc7db4b2da 100644
--- a/validate/tools/Makefile.am
+++ b/validate/tools/Makefile.am
@@ -39,11 +39,11 @@ bin_PROGRAMS += gst-validate-images-check-@GST_API_VERSION@
 noinst_PROGRAMS += gst-validate-images-check-@GST_API_VERSION@-debug
 
 gst_validate_images_check_@GST_API_VERSION@_SOURCES = gst-validate-images-check.c
-gst_validate_images_check_@GST_API_VERSION@_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/gst-libs/gst/video/
+gst_validate_images_check_@GST_API_VERSION@_CFLAGS = $(AM_CFLAGS)
 gst_validate_images_check_@GST_API_VERSION@_LDADD = $(LDADD) $(top_builddir)/gst-libs/gst/video/libgstvalidatevideo-@GST_API_VERSION@.la
 
 gst_validate_images_check_@GST_API_VERSION@_debug_SOURCES = gst-validate-images-check.c
-gst_validate_images_check_@GST_API_VERSION@_debug_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/gst-libs/gst/video/
+gst_validate_images_check_@GST_API_VERSION@_debug_CFLAGS = $(AM_CFLAGS)
 gst_validate_images_check_@GST_API_VERSION@_debug_LDADD = $(LDADD) $(top_builddir)/gst-libs/gst/video/libgstvalidatevideo-@GST_API_VERSION@.la
 gst_validate_images_check_@GST_API_VERSION@_debug_LDFLAGS = -no-install
 endif
diff --git a/validate/tools/gst-validate-images-check.c b/validate/tools/gst-validate-images-check.c
index 4f45a242f2..9c7302ec4c 100644
--- a/validate/tools/gst-validate-images-check.c
+++ b/validate/tools/gst-validate-images-check.c
@@ -20,7 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gstvalidatessim.h>
+#include "../gst-libs/gst/video/gstvalidatessim.h"
 
 #include <gst/gst.h>
 #include <gst/validate/validate.h>