diff --git a/validate/configure.ac b/validate/configure.ac
index 68a08052ed..8d86dfdfd1 100644
--- a/validate/configure.ac
+++ b/validate/configure.ac
@@ -268,6 +268,8 @@ common/m4/Makefile
 data/Makefile
 gst/Makefile
 gst/validate/Makefile
+gst/preload/Makefile
+gst/overrides/Makefile
 pkgconfig/Makefile
 pkgconfig/gst-validate-uninstalled.pc
 pkgconfig/gst-validate.pc
diff --git a/validate/gst/Makefile.am b/validate/gst/Makefile.am
index bc3ef4b12a..7e44971956 100644
--- a/validate/gst/Makefile.am
+++ b/validate/gst/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS = validate
+SUBDIRS = validate overrides
+
+if HAVE_LD_PRELOAD
+SUBDIRS += preload
+endif
diff --git a/validate/gst/overrides/Makefile.am b/validate/gst/overrides/Makefile.am
new file mode 100644
index 0000000000..b9aba7ff12
--- /dev/null
+++ b/validate/gst/overrides/Makefile.am
@@ -0,0 +1,14 @@
+lib_LTLIBRARIES = libgstvalidate-default-overrides-@GST_API_VERSION@.la
+libgstvalidate_default_overrides_@GST_API_VERSION@_la_SOURCES = \
+    gst-validate-default-overrides.c
+
+libgstvalidate_default_overrides_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS) $(GIO_CFLAGS)
+libgstvalidate_default_overrides_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \
+	$(GST_LT_LDFLAGS) $(GIO_LDFLAGS) $(top_builddir)/gst/validate/libgstvalidate-1.0.la
+libgstvalidate_default_overrides_@GST_API_VERSION@_la_LIBADD = \
+	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
+	$(GST_ALL_LIBS) $(GIO_LIBS)
+libgstvalidate_default_overrides_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate
+libgstvalidate_default_overrides_@GST_API_VERSION@include_HEADERS =
+
+CLEANFILES =
diff --git a/validate/gst/validate/gst-validate-default-overrides.c b/validate/gst/overrides/gst-validate-default-overrides.c
similarity index 90%
rename from validate/gst/validate/gst-validate-default-overrides.c
rename to validate/gst/overrides/gst-validate-default-overrides.c
index 3c1481e22e..3c846ef2a8 100644
--- a/validate/gst/validate/gst-validate-default-overrides.c
+++ b/validate/gst/overrides/gst-validate-default-overrides.c
@@ -24,9 +24,9 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "gst-validate-override.h"
-#include "gst-validate-override-registry.h"
-#include "gst-validate-report.h"
+#include <gst/validate/gst-validate-override.h>
+#include <gst/validate/gst-validate-override-registry.h>
+#include <gst/validate/gst-validate-report.h>
 
 /* public symbol */
 int gst_validate_create_overrides (void);
diff --git a/validate/gst/preload/Makefile.am b/validate/gst/preload/Makefile.am
new file mode 100644
index 0000000000..a43c0d0c8e
--- /dev/null
+++ b/validate/gst/preload/Makefile.am
@@ -0,0 +1,13 @@
+libgstvalidate_preload_@GST_API_VERSION@_la_SOURCES = \
+	gst-validate-monitor-preload.c
+
+libgstvalidate_preload_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS)
+libgstvalidate_preload_@GST_API_VERSION@_la_LDFLAGS =  $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \
+	$(GST_LT_LDFLAGS) $(top_builddir)/gst/validate/libgstvalidate-1.0.la
+libgstvalidate_preload_@GST_API_VERSION@_la_LIBADD =  \
+	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
+	$(GST_ALL_LIBS)
+libgstvalidate_preload_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate
+libgstvalidate_preload_@GST_API_VERSION@include_HEADERS =
+
+CLEANFILES =
diff --git a/validate/gst/validate/gst-validate-monitor-preload.c b/validate/gst/preload/gst-validate-monitor-preload.c
similarity index 100%
rename from validate/gst/validate/gst-validate-monitor-preload.c
rename to validate/gst/preload/gst-validate-monitor-preload.c
diff --git a/validate/gst/validate/Makefile.am b/validate/gst/validate/Makefile.am
index 41af0baa57..c521dbdc0a 100644
--- a/validate/gst/validate/Makefile.am
+++ b/validate/gst/validate/Makefile.am
@@ -41,12 +41,6 @@ libgstvalidate_@GST_API_VERSION@include_HEADERS = \
 
 
 lib_LTLIBRARIES = libgstvalidate-@GST_API_VERSION@.la
-
-if HAVE_LD_PRELOAD
-lib_LTLIBRARIES += libgstvalidate-default-overrides-@GST_API_VERSION@.la \
-	libgstvalidate-preload-@GST_API_VERSION@.la
-endif
-
 libgstvalidate_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS) $(GIO_CFLAGS) $(GST_PBUTILS_CFLAGS)
 libgstvalidate_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \
 	$(GST_LT_LDFLAGS) $(GIO_LDFLAGS) $(GST_PBUTILS_LDFAGS)
@@ -56,34 +50,4 @@ libgstvalidate_@GST_API_VERSION@_la_LIBADD = \
 
 libgstvalidate_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate
 
-if HAVE_LD_PRELOAD
-libgstvalidate_default_overrides_@GST_API_VERSION@_la_SOURCES = \
-    gst-validate-default-overrides.c
-
-libgstvalidate_default_overrides_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS) $(GIO_CFLAGS)
-libgstvalidate_default_overrides_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \
-	$(GST_LT_LDFLAGS) $(GIO_LDFLAGS)
-libgstvalidate_default_overrides_@GST_API_VERSION@_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
-	$(GST_ALL_LIBS) $(GIO_LIBS)
-
-libgstvalidate_default_overrides_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate
-libgstvalidate_default_overrides_@GST_API_VERSION@include_HEADERS =
-
-libgstvalidate_preload_@GST_API_VERSION@_la_SOURCES = \
-	gst-validate-monitor-preload.c
-
-libgstvalidate_preload_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS)
-libgstvalidate_preload_@GST_API_VERSION@_la_LDFLAGS =  $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \
-	$(GST_LT_LDFLAGS)
-libgstvalidate_preload_@GST_API_VERSION@_la_LIBADD =  \
-	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
-	$(GST_ALL_LIBS)
-libgstvalidate_preload_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate
-libgstvalidate_preload_@GST_API_VERSION@include_HEADERS =
-endif
-
-#AM_CFLAGS = $(GST_ALL_CFLAGS) $(GST_PBUTILS_CFLAGS)
-#LDADD = $(top_builddir)/gst/validate/libgstvalidate-@GST_API_VERSION@.la $(GST_PBUTILS_LIBS) $(GST_LIBS)
-
 CLEANFILES =