Rename src/ to libweston/

This clarifies what is supposed to be the libweston code.

v2: screen-share.c is already in compositor/ instead.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Benoit Gschwind <gschwind@gnu-log.net>
Acked-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: rebased]

65 files changed, 101 insertions, 101 deletions

diff --git a/Makefile.am b/Makefile.am
index 0d0334a7..67ac3516 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,8 +44,8 @@ all-local : weston.ini ivi-shell/weston.ini
 AM_CFLAGS = $(GCC_CFLAGS)
 
 AM_CPPFLAGS = 					\
-	-I$(top_srcdir)/src			\
-	-I$(top_builddir)/src			\
+	-I$(top_srcdir)/libweston		\
+	-I$(top_builddir)/libweston		\
 	-I$(top_builddir)/clients		\
 	-I$(top_builddir)/tests			\
 	-I$(top_srcdir)/shared			\
@@ -70,38 +70,38 @@ libweston_la_LIBADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
 libweston_la_LDFLAGS = -release ${LIBWESTON_ABI_VERSION}
 
 libweston_la_SOURCES =					\
-	src/git-version.h				\
-	src/log.c					\
-	src/compositor.c				\
-	src/compositor.h				\
-	src/compositor-drm.h				\
-	src/compositor-fbdev.h				\
-	src/compositor-headless.h			\
-	src/compositor-rdp.h				\
-	src/compositor-wayland.h			\
-	src/compositor-x11.h				\
-	src/input.c					\
-	src/data-device.c				\
-	src/screenshooter.c				\
-	src/clipboard.c					\
-	src/zoom.c					\
-	src/bindings.c					\
-	src/animation.c					\
-	src/noop-renderer.c				\
-	src/pixman-renderer.c				\
-	src/pixman-renderer.h				\
-	src/timeline.c					\
-	src/timeline.h					\
-	src/timeline-object.h				\
-	src/linux-dmabuf.c				\
-	src/linux-dmabuf.h				\
+	libweston/git-version.h				\
+	libweston/log.c					\
+	libweston/compositor.c				\
+	libweston/compositor.h				\
+	libweston/compositor-drm.h			\
+	libweston/compositor-fbdev.h			\
+	libweston/compositor-headless.h			\
+	libweston/compositor-rdp.h			\
+	libweston/compositor-wayland.h			\
+	libweston/compositor-x11.h			\
+	libweston/input.c				\
+	libweston/data-device.c				\
+	libweston/screenshooter.c			\
+	libweston/clipboard.c				\
+	libweston/zoom.c				\
+	libweston/bindings.c				\
+	libweston/animation.c				\
+	libweston/noop-renderer.c			\
+	libweston/pixman-renderer.c			\
+	libweston/pixman-renderer.h			\
+	libweston/timeline.c				\
+	libweston/timeline.h				\
+	libweston/timeline-object.h			\
+	libweston/linux-dmabuf.c			\
+	libweston/linux-dmabuf.h			\
 	shared/helpers.h				\
 	shared/matrix.c					\
 	shared/matrix.h					\
 	shared/timespec-util.h				\
 	shared/zalloc.h					\
 	shared/platform.h				\
-	src/weston-egl-ext.h
+	libweston/weston-egl-ext.h
 
 if SYSTEMD_NOTIFY_SUPPORT
 module_LTLIBRARIES += systemd-notify.la
@@ -116,7 +116,7 @@ systemd_notify_la_SOURCES =			\
 	compositor/systemd-notify.c		\
 	shared/helpers.h			\
 	shared/zalloc.h				\
-	src/compositor.h
+	libweston/compositor.h
 endif
 
 nodist_libweston_la_SOURCES =					\
@@ -156,37 +156,37 @@ weston_SOURCES = 					\
 # add BUILT_SOURCES to CLEANFILES, but we want to keep git-version.h
 # in case we're building from tarballs.
 
-src/compositor.c : $(top_builddir)/src/git-version.h
+libweston/compositor.c : $(top_builddir)/libweston/git-version.h
 
 noinst_LTLIBRARIES +=				\
 	libsession-helper.la
 
 libsession_helper_la_SOURCES =			\
-	src/launcher-util.c			\
-	src/launcher-util.h			\
-	src/launcher-impl.h			\
-	src/weston-launch.h			\
-	src/launcher-weston-launch.c		\
-	src/launcher-direct.c
+	libweston/launcher-util.c		\
+	libweston/launcher-util.h		\
+	libweston/launcher-impl.h		\
+	libweston/weston-launch.h		\
+	libweston/launcher-weston-launch.c	\
+	libweston/launcher-direct.c
 libsession_helper_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS)
 libsession_helper_la_LIBADD = $(LIBDRM_LIBS)
 
 if ENABLE_DBUS
 if HAVE_SYSTEMD_LOGIN
 libsession_helper_la_SOURCES +=			\
-	src/dbus.h				\
-	src/dbus.c				\
-	src/launcher-logind.c
+	libweston/dbus.h			\
+	libweston/dbus.c			\
+	libweston/launcher-logind.c
 libsession_helper_la_CFLAGS += $(SYSTEMD_LOGIN_CFLAGS) $(DBUS_CFLAGS)
 libsession_helper_la_LIBADD += $(SYSTEMD_LOGIN_LIBS) $(DBUS_LIBS)
 endif
 endif
 
 if HAVE_GIT_REPO
-src/git-version.h : $(top_srcdir)/.git/logs/HEAD
+libweston/git-version.h : $(top_srcdir)/.git/logs/HEAD
 	$(AM_V_GEN)echo "#define BUILD_ID \"$(shell git --git-dir=$(top_srcdir)/.git describe --always --dirty) $(shell git --git-dir=$(top_srcdir)/.git log -1 --format='%s (%ci)')\"" > $@
 else
-src/git-version.h :
+libweston/git-version.h :
 	$(AM_V_GEN)echo "#define BUILD_ID \"unknown (not built from git or tarball)\"" > $@
 
 endif
@@ -195,7 +195,7 @@ endif
 
 if BUILD_WESTON_LAUNCH
 bin_PROGRAMS += weston-launch
-weston_launch_SOURCES = src/weston-launch.c src/weston-launch.h
+weston_launch_SOURCES = libweston/weston-launch.c libweston/weston-launch.h
 weston_launch_CPPFLAGS = -DBINDIR='"$(bindir)"'
 weston_launch_CFLAGS=				\
 	$(AM_CFLAGS)				\
@@ -220,22 +220,22 @@ endif
 endif # BUILD_WESTON_LAUNCH
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = compositor/weston.pc src/libweston-${LIBWESTON_ABI_VERSION}.pc
+pkgconfig_DATA = compositor/weston.pc libweston/libweston-${LIBWESTON_ABI_VERSION}.pc
 
 wayland_sessiondir = $(datadir)/wayland-sessions
 dist_wayland_session_DATA = compositor/weston.desktop
 
 libwestonincludedir = $(includedir)/libweston-${LIBWESTON_ABI_VERSION}
-libwestoninclude_HEADERS =				\
-	src/version.h				\
-	src/compositor.h			\
-	src/compositor-drm.h			\
-	src/compositor-fbdev.h			\
-	src/compositor-headless.h		\
-	src/compositor-rdp.h			\
-	src/compositor-wayland.h		\
-	src/compositor-x11.h			\
-	src/timeline-object.h			\
+libwestoninclude_HEADERS =			\
+	libweston/version.h			\
+	libweston/compositor.h			\
+	libweston/compositor-drm.h		\
+	libweston/compositor-fbdev.h		\
+	libweston/compositor-headless.h		\
+	libweston/compositor-rdp.h		\
+	libweston/compositor-wayland.h		\
+	libweston/compositor-x11.h		\
+	libweston/timeline-object.h		\
 	shared/matrix.h				\
 	shared/config-parser.h			\
 	shared/zalloc.h				\
@@ -259,10 +259,10 @@ gl_renderer_la_CFLAGS =				\
 	$(GL_RENDERER_CFLAGS)			\
 	$(AM_CFLAGS)
 gl_renderer_la_SOURCES =			\
-	src/gl-renderer.h			\
-	src/gl-renderer.c			\
-	src/vertex-clipping.c			\
-	src/vertex-clipping.h			\
+	libweston/gl-renderer.h			\
+	libweston/gl-renderer.c			\
+	libweston/vertex-clipping.c		\
+	libweston/vertex-clipping.h		\
 	shared/helpers.h
 endif
 
@@ -279,17 +279,17 @@ x11_backend_la_CFLAGS =				\
 	$(X11_COMPOSITOR_CFLAGS)		\
 	$(AM_CFLAGS)
 x11_backend_la_SOURCES = 			\
-	src/compositor-x11.c			\
-	src/compositor-x11.h			\
+	libweston/compositor-x11.c		\
+	libweston/compositor-x11.h		\
 	shared/helpers.h
 endif
 
 INPUT_BACKEND_LIBS = $(LIBINPUT_BACKEND_LIBS)
 INPUT_BACKEND_SOURCES =				\
-	src/libinput-seat.c			\
-	src/libinput-seat.h			\
-	src/libinput-device.c			\
-	src/libinput-device.h			\
+	libweston/libinput-seat.c		\
+	libweston/libinput-seat.h		\
+	libweston/libinput-device.c		\
+	libweston/libinput-device.h		\
 	shared/helpers.h
 
 if ENABLE_DRM_COMPOSITOR
@@ -308,16 +308,16 @@ drm_backend_la_CFLAGS =				\
 	$(DRM_COMPOSITOR_CFLAGS)		\
 	$(AM_CFLAGS)
 drm_backend_la_SOURCES =			\
-	src/compositor-drm.c			\
-	src/compositor-drm.h            \
+	libweston/compositor-drm.c		\
+	libweston/compositor-drm.h		\
 	$(INPUT_BACKEND_SOURCES)		\
 	shared/helpers.h			\
 	shared/timespec-util.h			\
-	src/libbacklight.c			\
-	src/libbacklight.h
+	libweston/libbacklight.c		\
+	libweston/libbacklight.h
 
 if ENABLE_VAAPI_RECORDER
-drm_backend_la_SOURCES += src/vaapi-recorder.c src/vaapi-recorder.h
+drm_backend_la_SOURCES += libweston/vaapi-recorder.c libweston/vaapi-recorder.h
 drm_backend_la_LIBADD += $(LIBVA_LIBS)
 drm_backend_la_CFLAGS += $(LIBVA_CFLAGS)
 endif
@@ -338,8 +338,8 @@ wayland_backend_la_CFLAGS =			\
 	$(WAYLAND_COMPOSITOR_CFLAGS)		\
 	$(AM_CFLAGS)
 wayland_backend_la_SOURCES = 			\
-	src/compositor-wayland.c		\
-	src/compositor-wayland.h		\
+	libweston/compositor-wayland.c		\
+	libweston/compositor-wayland.h		\
 	shared/helpers.h
 nodist_wayland_backend_la_SOURCES =			\
 	protocol/fullscreen-shell-unstable-v1-protocol.c		\
@@ -352,8 +352,8 @@ headless_backend_la_LDFLAGS = -module -avoid-version
 headless_backend_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la
 headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(AM_CFLAGS)
 headless_backend_la_SOURCES = 			\
-	src/compositor-headless.c		\
-	src/compositor-headless.h		\
+	libweston/compositor-headless.c		\
+	libweston/compositor-headless.h		\
 	shared/helpers.h
 endif
 
@@ -373,8 +373,8 @@ fbdev_backend_la_CFLAGS =			\
 	$(PIXMAN_CFLAGS)			\
 	$(AM_CFLAGS)
 fbdev_backend_la_SOURCES =			\
-	src/compositor-fbdev.c			\
-	src/compositor-fbdev.h			\
+	libweston/compositor-fbdev.c		\
+	libweston/compositor-fbdev.h		\
 	shared/helpers.h			\
 	$(INPUT_BACKEND_SOURCES)
 endif
@@ -390,8 +390,8 @@ rdp_backend_la_CFLAGS =				\
 	$(RDP_COMPOSITOR_CFLAGS)		\
 	$(AM_CFLAGS)
 rdp_backend_la_SOURCES = 			\
-	src/compositor-rdp.c			\
-	src/compositor-rdp.h			\
+	libweston/compositor-rdp.c		\
+	libweston/compositor-rdp.h		\
 	shared/helpers.h
 endif
 
@@ -422,11 +422,11 @@ noinst_PROGRAMS += spring-tool
 spring_tool_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS)
 spring_tool_LDADD = $(COMPOSITOR_LIBS) -lm
 spring_tool_SOURCES =				\
-	src/spring-tool.c			\
-	src/animation.c				\
+	libweston/spring-tool.c			\
+	libweston/animation.c			\
 	shared/matrix.c				\
 	shared/matrix.h				\
-	src/compositor.h
+	libweston/compositor.h
 
 if BUILD_CLIENTS
 
@@ -607,8 +607,8 @@ weston_image_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_cliptest_SOURCES =				\
 	clients/cliptest.c				\
-	src/vertex-clipping.c				\
-	src/vertex-clipping.h
+	libweston/vertex-clipping.c			\
+	libweston/vertex-clipping.h
 weston_cliptest_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 weston_cliptest_LDADD = libtoytoolkit.la
 
@@ -837,8 +837,8 @@ module_LTLIBRARIES += desktop-shell.la
 desktop_shell_la_CPPFLAGS =			\
 	-I$(top_builddir)/protocol		\
 	-I$(top_srcdir)/shared			\
-	-I$(top_srcdir)/src			\
-	-I$(top_builddir)/src			\
+	-I$(top_srcdir)/libweston		\
+	-I$(top_builddir)/libweston		\
 	-I$(top_builddir)/desktop-shell		\
 	-DDATADIR='"$(datadir)"'		\
 	-DMODULEDIR='"$(moduledir)"'		\
@@ -870,8 +870,8 @@ module_LTLIBRARIES += fullscreen-shell.la
 fullscreen_shell_la_CPPFLAGS =			\
 	-I$(top_builddir)/protocol		\
 	-I$(top_srcdir)/shared			\
-	-I$(top_srcdir)/src			\
-	-I$(top_builddir)/src			\
+	-I$(top_srcdir)/libweston		\
+	-I$(top_builddir)/libweston		\
 	-DIN_WESTON
 
 fullscreen_shell_la_LDFLAGS = -module -avoid-version
@@ -960,8 +960,8 @@ module_LTLIBRARIES += xwayland.la
 xwayland_la_CPPFLAGS =				\
 	-I$(top_builddir)/protocol		\
 	-I$(top_srcdir)/shared			\
-	-I$(top_srcdir)/src			\
-	-I$(top_builddir)/src			\
+	-I$(top_srcdir)/libweston		\
+	-I$(top_builddir)/libweston		\
 	-I$(top_builddir)/xwayland		\
 	-DDATADIR='"$(datadir)"'		\
 	-DMODULEDIR='"$(moduledir)"'		\
@@ -1184,8 +1184,8 @@ config_parser_test_CFLAGS =			\
 vertex_clip_test_SOURCES =			\
 	tests/vertex-clip-test.c		\
 	shared/helpers.h			\
-	src/vertex-clipping.c			\
-	src/vertex-clipping.h
+	libweston/vertex-clipping.c		\
+	libweston/vertex-clipping.h
 vertex_clip_test_LDADD = libtest-runner.la -lm $(CLOCK_GETTIME_LIBS)
 
 libtest_client_la_SOURCES =			\
@@ -1334,8 +1334,8 @@ if BUILD_SETBACKLIGHT
 noinst_PROGRAMS += setbacklight
 setbacklight_SOURCES =				\
 	tests/setbacklight.c			\
-	src/libbacklight.c			\
-	src/libbacklight.h
+	libweston/libbacklight.c		\
+	libweston/libbacklight.h
 setbacklight_CFLAGS = $(AM_CFLAGS) $(SETBACKLIGHT_CFLAGS)
 setbacklight_LDADD = $(SETBACKLIGHT_LIBS)
 endif
diff --git a/clients/cliptest.c b/clients/cliptest.c
index d0f4e3ea..57aefdab 100644
--- a/clients/cliptest.c
+++ b/clients/cliptest.c
@@ -49,7 +49,7 @@
 #include <linux/input.h>
 #include <wayland-client.h>
 
-#include "src/vertex-clipping.h"
+#include "libweston/vertex-clipping.h"
 #include "shared/xalloc.h"
 #include "window.h"
 
diff --git a/configure.ac b/configure.ac
index 41191f69..9a7211d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -633,11 +633,11 @@ if test "x$enable_systemd_notify" = "xyes"; then
   PKG_CHECK_MODULES(SYSTEMD_DAEMON, [libsystemd])
 fi
 
-AC_CONFIG_FILES([Makefile src/version.h compositor/weston.pc])
+AC_CONFIG_FILES([Makefile libweston/version.h compositor/weston.pc])
 
 # AC_CONFIG_FILES needs the full name when running autoconf, so we need to use
 # libweston_abi_version here, and outside [] because of m4 quoting rules
-AC_CONFIG_FILES([src/libweston-]libweston_abi_version[.pc:src/libweston.pc.in])
+AC_CONFIG_FILES([libweston/libweston-]libweston_abi_version[.pc:libweston/libweston.pc.in])
 
 AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD])
 
diff --git a/src/animation.c b/libweston/animation.c
index 2c7943f6..2c7943f6 100644
--- a/src/animation.c
+++ b/libweston/animation.c
diff --git a/src/bindings.c b/libweston/bindings.c
index cc68cfe1..cc68cfe1 100644
--- a/src/bindings.c
+++ b/libweston/bindings.c
diff --git a/src/clipboard.c b/libweston/clipboard.c
index 54a578f0..54a578f0 100644
--- a/src/clipboard.c
+++ b/libweston/clipboard.c
diff --git a/src/compositor-drm.c b/libweston/compositor-drm.c
index f903a3b4..f903a3b4 100644
--- a/src/compositor-drm.c
+++ b/libweston/compositor-drm.c
diff --git a/src/compositor-drm.h b/libweston/compositor-drm.h
index 1266031f..1266031f 100644
--- a/src/compositor-drm.h
+++ b/libweston/compositor-drm.h
diff --git a/src/compositor-fbdev.c b/libweston/compositor-fbdev.c
index e21ceca5..e21ceca5 100644
--- a/src/compositor-fbdev.c
+++ b/libweston/compositor-fbdev.c
diff --git a/src/compositor-fbdev.h b/libweston/compositor-fbdev.h
index 9b5bf8e6..9b5bf8e6 100644
--- a/src/compositor-fbdev.h
+++ b/libweston/compositor-fbdev.h
diff --git a/src/compositor-headless.c b/libweston/compositor-headless.c
index b78c3210..b78c3210 100644
--- a/src/compositor-headless.c
+++ b/libweston/compositor-headless.c
diff --git a/src/compositor-headless.h b/libweston/compositor-headless.h
index 79f39c89..79f39c89 100644
--- a/src/compositor-headless.h
+++ b/libweston/compositor-headless.h
diff --git a/src/compositor-rdp.c b/libweston/compositor-rdp.c
index d74dd5e5..d74dd5e5 100644
--- a/src/compositor-rdp.c
+++ b/libweston/compositor-rdp.c
diff --git a/src/compositor-rdp.h b/libweston/compositor-rdp.h
index dfa1759a..dfa1759a 100644
--- a/src/compositor-rdp.h
+++ b/libweston/compositor-rdp.h
diff --git a/src/compositor-wayland.c b/libweston/compositor-wayland.c
index 1343e21f..1343e21f 100644
--- a/src/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
diff --git a/src/compositor-wayland.h b/libweston/compositor-wayland.h
index de69b988..de69b988 100644
--- a/src/compositor-wayland.h
+++ b/libweston/compositor-wayland.h
diff --git a/src/compositor-x11.c b/libweston/compositor-x11.c
index 5e46e68d..5e46e68d 100644
--- a/src/compositor-x11.c
+++ b/libweston/compositor-x11.c
diff --git a/src/compositor-x11.h b/libweston/compositor-x11.h
index 8363a760..8363a760 100644
--- a/src/compositor-x11.h
+++ b/libweston/compositor-x11.h
diff --git a/src/compositor.c b/libweston/compositor.c
index 37d94ec9..37d94ec9 100644
--- a/src/compositor.c
+++ b/libweston/compositor.c
diff --git a/src/compositor.h b/libweston/compositor.h
index 9e5155c6..9e5155c6 100644
--- a/src/compositor.h
+++ b/libweston/compositor.h
diff --git a/src/data-device.c b/libweston/data-device.c
index f04f0308..f04f0308 100644
--- a/src/data-device.c
+++ b/libweston/data-device.c
diff --git a/src/dbus.c b/libweston/dbus.c
index cadedd9d..cadedd9d 100644
--- a/src/dbus.c
+++ b/libweston/dbus.c
diff --git a/src/dbus.h b/libweston/dbus.h
index 9bbfa380..9bbfa380 100644
--- a/src/dbus.h
+++ b/libweston/dbus.h
diff --git a/src/gl-renderer.c b/libweston/gl-renderer.c
index 23c0cd72..23c0cd72 100644
--- a/src/gl-renderer.c
+++ b/libweston/gl-renderer.c
diff --git a/src/gl-renderer.h b/libweston/gl-renderer.h
index 71f6b46e..71f6b46e 100644
--- a/src/gl-renderer.h
+++ b/libweston/gl-renderer.h
diff --git a/src/input.c b/libweston/input.c
index 08378d1e..08378d1e 100644
--- a/src/input.c
+++ b/libweston/input.c
diff --git a/src/launcher-direct.c b/libweston/launcher-direct.c
index 29d9c28b..29d9c28b 100644
--- a/src/launcher-direct.c
+++ b/libweston/launcher-direct.c
diff --git a/src/launcher-impl.h b/libweston/launcher-impl.h
index 742721bf..742721bf 100644
--- a/src/launcher-impl.h
+++ b/libweston/launcher-impl.h
diff --git a/src/launcher-logind.c b/libweston/launcher-logind.c
index f755ec33..f755ec33 100644
--- a/src/launcher-logind.c
+++ b/libweston/launcher-logind.c
diff --git a/src/launcher-util.c b/libweston/launcher-util.c
index 03b9d632..03b9d632 100644
--- a/src/launcher-util.c
+++ b/libweston/launcher-util.c
diff --git a/src/launcher-util.h b/libweston/launcher-util.h
index 93321ab7..93321ab7 100644
--- a/src/launcher-util.h
+++ b/libweston/launcher-util.h
diff --git a/src/launcher-weston-launch.c b/libweston/launcher-weston-launch.c
index ad919f18..ad919f18 100644
--- a/src/launcher-weston-launch.c
+++ b/libweston/launcher-weston-launch.c
diff --git a/src/libbacklight.c b/libweston/libbacklight.c
index 722d66f0..722d66f0 100644
--- a/src/libbacklight.c
+++ b/libweston/libbacklight.c
diff --git a/src/libbacklight.h b/libweston/libbacklight.h
index 8717ab10..8717ab10 100644
--- a/src/libbacklight.h
+++ b/libweston/libbacklight.h
diff --git a/src/libinput-device.c b/libweston/libinput-device.c
index 62350f2e..62350f2e 100644
--- a/src/libinput-device.c
+++ b/libweston/libinput-device.c
diff --git a/src/libinput-device.h b/libweston/libinput-device.h
index 5041a4aa..5041a4aa 100644
--- a/src/libinput-device.h
+++ b/libweston/libinput-device.h
diff --git a/src/libinput-seat.c b/libweston/libinput-seat.c
index 94e19f5e..94e19f5e 100644
--- a/src/libinput-seat.c
+++ b/libweston/libinput-seat.c
diff --git a/src/libinput-seat.h b/libweston/libinput-seat.h
index 65c9b64b..65c9b64b 100644
--- a/src/libinput-seat.h
+++ b/libweston/libinput-seat.h
diff --git a/src/libweston.pc.in b/libweston/libweston.pc.in
index 24fe8133..24fe8133 100644
--- a/src/libweston.pc.in
+++ b/libweston/libweston.pc.in
diff --git a/src/linux-dmabuf.c b/libweston/linux-dmabuf.c
index 78e77a24..78e77a24 100644
--- a/src/linux-dmabuf.c
+++ b/libweston/linux-dmabuf.c
diff --git a/src/linux-dmabuf.h b/libweston/linux-dmabuf.h
index cd30f91c..cd30f91c 100644
--- a/src/linux-dmabuf.h
+++ b/libweston/linux-dmabuf.h
diff --git a/src/log.c b/libweston/log.c
index 7d99a95d..7d99a95d 100644
--- a/src/log.c
+++ b/libweston/log.c
diff --git a/src/noop-renderer.c b/libweston/noop-renderer.c
index b6499b82..b6499b82 100644
--- a/src/noop-renderer.c
+++ b/libweston/noop-renderer.c
diff --git a/src/pixman-renderer.c b/libweston/pixman-renderer.c
index f66a11ed..f66a11ed 100644
--- a/src/pixman-renderer.c
+++ b/libweston/pixman-renderer.c
diff --git a/src/pixman-renderer.h b/libweston/pixman-renderer.h
index 1b42f14f..1b42f14f 100644
--- a/src/pixman-renderer.h
+++ b/libweston/pixman-renderer.h
diff --git a/src/screenshooter.c b/libweston/screenshooter.c
index fc14ad30..fc14ad30 100644
--- a/src/screenshooter.c
+++ b/libweston/screenshooter.c
diff --git a/src/spring-tool.c b/libweston/spring-tool.c
index 1848b3f7..1848b3f7 100644
--- a/src/spring-tool.c
+++ b/libweston/spring-tool.c
diff --git a/src/timeline-object.h b/libweston/timeline-object.h
index 943f979c..943f979c 100644
--- a/src/timeline-object.h
+++ b/libweston/timeline-object.h
diff --git a/src/timeline.c b/libweston/timeline.c
index cf82428e..cf82428e 100644
--- a/src/timeline.c
+++ b/libweston/timeline.c
diff --git a/src/timeline.h b/libweston/timeline.h
index b10a8157..b10a8157 100644
--- a/src/timeline.h
+++ b/libweston/timeline.h
diff --git a/src/vaapi-recorder.c b/libweston/vaapi-recorder.c
index 1228f7d1..1228f7d1 100644
--- a/src/vaapi-recorder.c
+++ b/libweston/vaapi-recorder.c
diff --git a/src/vaapi-recorder.h b/libweston/vaapi-recorder.h
index 6b194aa8..6b194aa8 100644
--- a/src/vaapi-recorder.h
+++ b/libweston/vaapi-recorder.h
diff --git a/src/version.h.in b/libweston/version.h.in
index b2379d09..b2379d09 100644
--- a/src/version.h.in
+++ b/libweston/version.h.in
diff --git a/src/vertex-clipping.c b/libweston/vertex-clipping.c
index a71e7336..a71e7336 100644
--- a/src/vertex-clipping.c
+++ b/libweston/vertex-clipping.c
diff --git a/src/vertex-clipping.h b/libweston/vertex-clipping.h
index 0c699021..0c699021 100644
--- a/src/vertex-clipping.h
+++ b/libweston/vertex-clipping.h
diff --git a/src/weston-egl-ext.h b/libweston/weston-egl-ext.h
index 32f6108f..32f6108f 100644
--- a/src/weston-egl-ext.h
+++ b/libweston/weston-egl-ext.h
diff --git a/src/weston-launch.c b/libweston/weston-launch.c
index 9987d8ee..9987d8ee 100644
--- a/src/weston-launch.c
+++ b/libweston/weston-launch.c
diff --git a/src/weston-launch.h b/libweston/weston-launch.h
index bd974de8..bd974de8 100644
--- a/src/weston-launch.h
+++ b/libweston/weston-launch.h
diff --git a/src/zoom.c b/libweston/zoom.c
index 08c06931..08c06931 100644
--- a/src/zoom.c
+++ b/libweston/zoom.c
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c
index f5e296cb..bc36ad13 100644
--- a/tests/ivi_layout-internal-test.c
+++ b/tests/ivi_layout-internal-test.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "src/compositor.h"
+#include "compositor.h"
 #include "ivi-shell/ivi-layout-export.h"
 #include "ivi-shell/ivi-layout-private.h"
 #include "ivi-test.h"
diff --git a/tests/ivi_layout-test-plugin.c b/tests/ivi_layout-test-plugin.c
index 4cae3c59..1a28c6ee 100644
--- a/tests/ivi_layout-test-plugin.c
+++ b/tests/ivi_layout-test-plugin.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "src/compositor.h"
+#include "compositor.h"
 #include "compositor/weston.h"
 #include "weston-test-server-protocol.h"
 #include "ivi-test.h"
diff --git a/tests/surface-global-test.c b/tests/surface-global-test.c
index 11b2455d..b0a1d1cb 100644
--- a/tests/surface-global-test.c
+++ b/tests/surface-global-test.c
@@ -27,7 +27,7 @@
 
 #include <assert.h>
 
-#include "src/compositor.h"
+#include "compositor.h"
 
 static void
 surface_to_from_global(void *data)
diff --git a/tests/surface-test.c b/tests/surface-test.c
index 55c324be..243f8dc3 100644
--- a/tests/surface-test.c
+++ b/tests/surface-test.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "src/compositor.h"
+#include "compositor.h"
 
 static void
 surface_transform(void *data)
diff --git a/tests/vertex-clip-test.c b/tests/vertex-clip-test.c
index 8a4e5a6b..ce876cec 100644
--- a/tests/vertex-clip-test.c
+++ b/tests/vertex-clip-test.c
@@ -31,7 +31,7 @@
 #include "weston-test-runner.h"
 
 #include "shared/helpers.h"
-#include "src/vertex-clipping.h"
+#include "vertex-clipping.h"
 
 #define BOUNDING_BOX_TOP_Y 100.0f
 #define BOUNDING_BOX_LEFT_X 50.0f
diff --git a/tests/weston-test.c b/tests/weston-test.c
index 26b2ae09..1793744c 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -31,14 +31,14 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "src/compositor.h"
+#include "compositor.h"
 #include "compositor/weston.h"
 #include "weston-test-server-protocol.h"
 
 #ifdef ENABLE_EGL
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-#include "src/weston-egl-ext.h"
+#include "weston-egl-ext.h"
 #endif /* ENABLE_EGL */
 
 #include "shared/helpers.h"