Revert "shared/helpers.h: Migrate helpers.h to libweston"

This is problematic as we don't have namespacing for these and some of
the macros can interfere with other defines.

This reverts commit 8634c7e349.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>

clients/calibrator.c

@@ -38,7 +38,7 @@
 #include <wayland-client.h>
 
 #include "window.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include <libweston/matrix.h>
 
 /* Our points for the calibration must be not be on a line */

clients/clickdot.c

@@ -40,7 +40,7 @@
 #include <wayland-client.h>
 
 #include "window.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 
 struct clickdot {

clients/cliptest.c

@@ -56,7 +56,7 @@
 
 #include "libweston/matrix.h"
 #include "libweston/vertex-clipping.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "window.h"
 

clients/color.c

@@ -27,7 +27,7 @@
 #include <errno.h>
 
 #include "color-management-v1-client-protocol.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "single-pixel-buffer-v1-client-protocol.h"
 #include "viewporter-client-protocol.h"

clients/constraints.c

@@ -30,7 +30,7 @@
 #include <linux/input.h>
 #include <wayland-cursor.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "shared/os-compatibility.h"
 #include "shared/cairo-util.h"

clients/desktop-shell.c

@@ -44,7 +44,7 @@
 
 #include <libweston/config-parser.h>
 #include <libweston/zalloc.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "shared/cairo-util.h"
 #include "shared/file-util.h"

clients/dnd.c

@@ -42,7 +42,7 @@
 
 #include "window.h"
 #include "shared/cairo-util.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 
 struct dnd_drag;

clients/editor.c

@@ -39,7 +39,7 @@
 #include <pango/pangocairo.h>
 
 #include <libweston/config-parser.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "window.h"
 #include "text-input-unstable-v1-client-protocol.h"

clients/eventdemo.c

@@ -42,7 +42,7 @@
 
 #include <cairo.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "window.h"
 
 /** window title */

clients/image.c

@@ -43,7 +43,7 @@
 
 #include "window.h"
 #include "shared/cairo-util.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/image-loader.h"
 
 bool verbose;

clients/ivi-shell-user-interface.c

@@ -40,7 +40,7 @@
 #include <wayland-client-protocol.h>
 #include "shared/cairo-util.h"
 #include <libweston/config-parser.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "shared/xalloc.h"
 #include <libweston/zalloc.h>

clients/presentation-shm.c

@@ -38,7 +38,7 @@
 #include <errno.h>
 
 #include <wayland-client.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include <libweston/zalloc.h>
 #include "shared/timespec-util.h"
 #include "shared/os-compatibility.h"

clients/simple-dmabuf-egl.c

@@ -43,7 +43,7 @@
 #include <gbm.h>
 
 #include <wayland-client.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/platform.h"
 #include "shared/weston-drm-fourcc.h"
 #include <libweston/zalloc.h>

clients/simple-dmabuf-feedback.c

@@ -34,7 +34,7 @@
 #include <sys/mman.h>
 #include <time.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/platform.h"
 #include "shared/weston-drm-fourcc.h"
 #include <libweston/zalloc.h>

clients/simple-dmabuf-v4l.c

@@ -46,14 +46,13 @@
 
 #include <wayland-client.h>
 #include <wayland-cursor.h>
-
 #include <libweston/zalloc.h>
-#include <libweston/helpers.h>
-
 #include "xdg-shell-client-protocol.h"
 #include "linux-dmabuf-unstable-v1-client-protocol.h"
 #include "weston-direct-display-client-protocol.h"
 #include "viewporter-client-protocol.h"
+
+#include "shared/helpers.h"
 #include "shared/weston-drm-fourcc.h"
 
 #define CLEAR(x) memset(&(x), 0, sizeof(x))

clients/simple-egl.c

@@ -51,7 +51,7 @@
 #include <unistd.h>
 
 #include <libweston/matrix.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/platform.h"
 #include "shared/weston-egl-ext.h"
 #include "shared/xalloc.h"

clients/simple-im.c

@@ -36,7 +36,7 @@
 
 #include "window.h"
 #include "input-method-unstable-v1-client-protocol.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 
 enum compose_state {
 	state_normal,

clients/simple-touch.c

@@ -36,7 +36,7 @@
 #include <sys/mman.h>
 
 #include <wayland-client.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "shared/os-compatibility.h"
 

clients/stacking.c

@@ -36,7 +36,7 @@
 #include <wayland-util.h>
 
 #include "shared/xalloc.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "window.h"
 
 struct stacking_window {

clients/subsurfaces.c

@@ -42,7 +42,7 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include <libweston/zalloc.h>
 #include "window.h"

clients/terminal.c

@@ -46,7 +46,7 @@
 #include <wayland-client.h>
 
 #include <libweston/config-parser.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "window.h"
 

clients/touch-calibrator.c

@@ -39,7 +39,7 @@
 #include <wayland-client.h>
 
 #include "clients/window.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include <libweston/matrix.h>
 
 #include "weston-touch-calibration-client-protocol.h"

clients/weston-debug.c

@@ -41,7 +41,7 @@
 
 #include <wayland-client.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include <libweston/zalloc.h>
 #include "weston-debug-client-protocol.h"
 

clients/window.c

@@ -52,7 +52,7 @@
 #include <linux/input.h>
 #include <wayland-client.h>
 #include "shared/cairo-util.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include <libweston/zalloc.h>
 #include "xdg-shell-client-protocol.h"

desktop-shell/input-panel.c

@@ -30,10 +30,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <libweston/helpers.h>
-
 #include "shell.h"
 #include "input-method-unstable-v1-server-protocol.h"
+#include "shared/helpers.h"
 
 struct input_panel_surface {
 	struct wl_resource *resource;

desktop-shell/shell.c

@@ -36,15 +36,14 @@
 #include <math.h>
 #include <sys/types.h>
 
-#include <libweston/config-parser.h>
-#include <libweston/helpers.h>
-#include <libweston/shell-utils.h>
-#include <libweston/desktop.h>
-
 #include "shell.h"
 #include "frontend/weston.h"
 #include "weston-desktop-shell-server-protocol.h"
+#include <libweston/config-parser.h>
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
+#include <libweston/shell-utils.h>
+#include <libweston/desktop.h>
 
 #define DEFAULT_NUM_WORKSPACES 1
 #define DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH 200

frontend/config-helpers.c

@@ -30,7 +30,7 @@
 #include <libweston/libweston.h>
 #include <libweston/config-parser.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "weston-private.h"
 
 struct {

frontend/main.c

@@ -47,16 +47,15 @@
 #include <sys/time.h>
 #include <linux/limits.h>
 
-#include <libweston/libweston.h>
-#include <libweston/helpers.h>
-#include <libweston/version.h>
-
 #include "weston.h"
+#include <libweston/libweston.h>
 #include "shared/os-compatibility.h"
+#include "shared/helpers.h"
 #include "shared/process-util.h"
 #include "shared/string-helpers.h"
 #include "shared/xalloc.h"
 #include "git-version.h"
+#include <libweston/version.h>
 #include "weston.h"
 #include "weston-private.h"
 

frontend/screen-share.c

@@ -41,14 +41,14 @@
 #include <wayland-client.h>
 
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
-#include <libweston/shell-utils.h>
 #include "backend.h"
 #include "libweston-internal.h"
 #include "pixel-formats.h"
 #include "weston.h"
+#include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "shared/timespec-util.h"
+#include <libweston/shell-utils.h>
 #include "fullscreen-shell-unstable-v1-client-protocol.h"
 
 struct shared_output {

frontend/systemd-notify.c

@@ -30,11 +30,10 @@
 #include <sys/socket.h>
 #include <wayland-server.h>
 
-#include <libweston/libweston.h>
-#include <libweston/zalloc.h>
-#include <libweston/helpers.h>
-
+#include "shared/helpers.h"
 #include "shared/string-helpers.h"
+#include <libweston/zalloc.h>
+#include <libweston/libweston.h>
 #include "weston.h"
 
 struct systemd_notifier {

frontend/text-backend.c

@@ -34,11 +34,10 @@
 #include <time.h>
 
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
-
 #include "weston.h"
 #include "text-input-unstable-v1-server-protocol.h"
 #include "input-method-unstable-v1-server-protocol.h"
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
 #include "shared/xalloc.h"
 

frontend/weston-screenshooter.c

@@ -30,8 +30,8 @@
 #include <linux/input.h>
 
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
 #include "weston.h"
+#include "shared/helpers.h"
 
 struct screenshooter {
 	struct weston_compositor *ec;

frontend/xwayland.c

@@ -35,7 +35,7 @@
 #include <libweston/libweston.h>
 #include "frontend/weston.h"
 #include <libweston/xwayland-api.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "shared/process-util.h"
 #include "shared/string-helpers.h"

fullscreen-shell/fullscreen-shell.c

@@ -34,11 +34,10 @@
 #include <assert.h>
 
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
-#include <libweston/shell-utils.h>
-
 #include "frontend/weston.h"
 #include "fullscreen-shell-unstable-v1-server-protocol.h"
+#include "shared/helpers.h"
+#include <libweston/shell-utils.h>
 
 struct fullscreen_shell {
 	struct wl_client *client;

include/libweston/meson.build

@@ -10,7 +10,6 @@ install_headers(
 	'remoting-plugin.h',
 	'pipewire-plugin.h',
 	'shell-utils.h',
-	'helpers.h',
 	subdir: dir_include_libweston_install
 )
 

include/libweston/windowed-output-api.h

@@ -31,7 +31,6 @@ extern "C" {
 #endif
 
 #include <libweston/plugin-registry.h>
-#include <libweston/helpers.h>
 
 struct weston_compositor;
 struct weston_output;

ivi-shell/hmi-controller.c

@@ -63,7 +63,7 @@
 
 #include "ivi-layout-export.h"
 #include "ivi-hmi-controller-server-protocol.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "frontend/weston.h"
 

ivi-shell/ivi-layout.c

@@ -68,7 +68,7 @@
 #include "ivi-layout-private.h"
 #include "ivi-layout-shell.h"
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "shared/xalloc.h"
 

ivi-shell/ivi-shell.c

@@ -42,14 +42,13 @@
 #include <assert.h>
 #include <linux/input.h>
 
-#include <libweston/libweston.h>
-#include <libweston/helpers.h>
-
 #include "input-method-unstable-v1-server-protocol.h"
 #include "ivi-shell.h"
 #include "ivi-application-server-protocol.h"
 #include "ivi-layout-private.h"
 #include "ivi-layout-shell.h"
+#include "libweston/libweston.h"
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "frontend/weston.h"
 

kiosk-shell/kiosk-shell-grab.c

@@ -24,7 +24,7 @@
  */
 
 #include "kiosk-shell-grab.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 
 struct kiosk_shell_grab {
 	struct kiosk_shell_surface *shsurf;

kiosk-shell/kiosk-shell.c

@@ -29,14 +29,14 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <libweston/helpers.h>
-#include <libweston/shell-utils.h>
-#include <libweston/xwayland-api.h>
-
 #include "kiosk-shell.h"
 #include "kiosk-shell-grab.h"
 #include "frontend/weston.h"
 #include "libweston/libweston.h"
+#include "shared/helpers.h"
+#include <libweston/shell-utils.h>
+
+#include <libweston/xwayland-api.h>
 
 static struct kiosk_shell_surface *
 get_kiosk_shell_surface(struct weston_surface *surface)

libweston/animation.c

@@ -37,7 +37,7 @@
 
 #include <libweston/libweston.h>
 #include "libweston-internal.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
 
 WL_EXPORT void

libweston/backend-drm/drm-internal.h

@@ -54,8 +54,8 @@
 #include <libweston/libweston.h>
 #include <libweston/backend-drm.h>
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
 #include "output-capture.h"
+#include "shared/helpers.h"
 #include "shared/weston-drm-fourcc.h"
 #include "libinput-seat.h"
 #include "backend.h"

libweston/backend-drm/drm.c

@@ -51,9 +51,9 @@
 #include <libweston/libweston.h>
 #include <libweston/backend-drm.h>
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
 #include "drm-internal.h"
 #include "shared/hash.h"
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
 #include "shared/string-helpers.h"
 #include "shared/weston-drm-fourcc.h"

libweston/backend-drm/fb.c

@@ -38,8 +38,8 @@
 #include <libweston/backend-drm.h>
 #include <libweston/pixel-formats.h>
 #include <libweston/linux-dmabuf.h>
-#include <libweston/helpers.h>
 #include "shared/hash.h"
+#include "shared/helpers.h"
 #include "shared/weston-drm-fourcc.h"
 #include "drm-internal.h"
 #include "linux-dmabuf.h"

libweston/backend-drm/kms.c

@@ -36,7 +36,7 @@
 
 #include <libweston/libweston.h>
 #include <libweston/backend-drm.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/weston-drm-fourcc.h"
 #include "drm-internal.h"
 #include "pixel-formats.h"

libweston/backend-headless/headless.c

@@ -37,7 +37,7 @@
 
 #include <libweston/libweston.h>
 #include <libweston/backend-headless.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "linux-explicit-synchronization.h"
 #include "pixel-formats.h"
 #include "pixman-renderer.h"

libweston/backend-pipewire/pipewire.c

@@ -49,14 +49,13 @@
 #include <spa/utils/defs.h>
 #include <spa/utils/result.h>
 
+#include "shared/helpers.h"
+#include "shared/timespec-util.h"
+#include "shared/xalloc.h"
 #include <libweston/libweston.h>
 #include <libweston/backend-pipewire.h>
 #include <libweston/linux-dmabuf.h>
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
-
-#include "shared/timespec-util.h"
-#include "shared/xalloc.h"
 #include "pixel-formats.h"
 #include "pixman-renderer.h"
 #include "renderer-gl/gl-renderer.h"

libweston/backend-rdp/rdp.h

@@ -51,12 +51,12 @@
 #include <libweston/libweston.h>
 #include <libweston/backend-rdp.h>
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
 
 #include <winpr/string.h>
 
 #include "backend.h"
 
+#include "shared/helpers.h"
 #include "shared/string-helpers.h"
 
 #define MAX_FREERDP_FDS 32

libweston/backend-vnc/vnc.c

@@ -47,13 +47,12 @@
 #include <neatvnc.h>
 #include <drm_fourcc.h>
 
+#include "shared/helpers.h"
+#include "shared/xalloc.h"
+#include "shared/timespec-util.h"
 #include <libweston/libweston.h>
 #include <libweston/backend-vnc.h>
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
-
-#include "shared/xalloc.h"
-#include "shared/timespec-util.h"
 #include "pixel-formats.h"
 #include "pixman-renderer.h"
 #include "renderer-gl/gl-renderer.h"

libweston/backend-wayland/wayland.c

@@ -52,7 +52,7 @@
 #include "shared/weston-drm-fourcc.h"
 #include "shared/weston-egl-ext.h"
 #include "pixman-renderer.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/image-loader.h"
 #include "shared/os-compatibility.h"
 #include "shared/cairo-util.h"

libweston/backend-x11/x11.c

@@ -52,7 +52,7 @@
 
 #include <libweston/libweston.h>
 #include <libweston/backend-x11.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/image-loader.h"
 #include "shared/timespec-util.h"
 #include "shared/file-util.h"

libweston/bindings.c

@@ -31,7 +31,7 @@
 
 #include <libweston/libweston.h>
 #include "libweston-internal.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
 #include "tablet-unstable-v2-server-protocol.h"
 

libweston/clipboard.c

@@ -34,9 +34,8 @@
 #include <sys/uio.h>
 
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
-
 #include "libweston-internal.h"
+#include "shared/helpers.h"
 
 struct clipboard_source {
 	struct weston_data_source base;

libweston/color-lcms/color-lcms.c

@@ -29,11 +29,11 @@
 #include <assert.h>
 #include <string.h>
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
 
 #include "color.h"
 #include "color-lcms.h"
 #include "color-properties.h"
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "shared/weston-assert.h"
 

libweston/color-lcms/color-lcms.h

@@ -30,9 +30,9 @@
 #include <lcms2.h>
 #include <libweston/libweston.h>
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
 
 #include "color.h"
+#include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 
 /*

libweston/color-lcms/color-profile.c

@@ -29,11 +29,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
 
 #include "color.h"
 #include "color-lcms.h"
 #include "color-management.h"
+#include "shared/helpers.h"
 #include "shared/string-helpers.h"
 #include "shared/xalloc.h"
 #include "shared/weston-assert.h"

libweston/color-lcms/color-transform.c

@@ -34,7 +34,7 @@
 #include "color-curve-segments.h"
 #include "color-lcms.h"
 #include "color-properties.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/string-helpers.h"
 #include "shared/weston-assert.h"
 #include "shared/xalloc.h"

libweston/color-management.c

@@ -25,13 +25,12 @@
 
 #include "config.h"
 
-#include <libweston/helpers.h>
-
 #include "color.h"
 #include "color-management.h"
 #include "shared/string-helpers.h"
 #include "shared/weston-assert.h"
 #include "shared/xalloc.h"
+#include "shared/helpers.h"
 
 #include <fcntl.h>
 

libweston/color-noop.c

@@ -26,9 +26,9 @@
 #include "config.h"
 
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
 
 #include "color.h"
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "shared/weston-assert.h"
 

libweston/color-profile-param-builder.c

@@ -25,10 +25,9 @@
 
 #include "config.h"
 
-#include <libweston/helpers.h>
-
 #include "color.h"
 #include "color-properties.h"
+#include "shared/helpers.h"
 #include "shared/string-helpers.h"
 #include "shared/xalloc.h"
 #include "shared/weston-assert.h"

libweston/color-properties.c

@@ -35,7 +35,7 @@
 
 #include <libweston/libweston.h>
 #include <color-properties.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/weston-assert.h"
 
 #include "color-management-v1-server-protocol.h"

libweston/color.c

@@ -40,8 +40,8 @@
 #include "id-number-allocator.h"
 #include "libweston-internal.h"
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
 #include "shared/string-helpers.h"
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 
 /**

libweston/compositor.c

@@ -58,7 +58,6 @@
 
 #include <libweston/libweston.h>
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
 #include "linux-dmabuf.h"
 #include "linux-dmabuf-unstable-v1-server-protocol.h"
 #include "viewporter-server-protocol.h"
@@ -68,6 +67,7 @@
 #include "linux-explicit-synchronization.h"
 #include "single-pixel-buffer-v1-server-protocol.h"
 #include "shared/fd-util.h"
+#include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "shared/string-helpers.h"
 #include "shared/timespec-util.h"

libweston/content-protection.c

@@ -34,7 +34,7 @@
 #include <libweston/weston-log.h>
 #include "libweston-internal.h"
 #include "weston-content-protection-server-protocol.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
 
 #define content_protection_log(cp, ...) \

libweston/data-device.c

@@ -34,7 +34,7 @@
 
 #include <libweston/libweston.h>
 #include "libweston-internal.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
 
 struct weston_drag {

libweston/desktop/libweston-desktop.c

@@ -30,7 +30,7 @@
 
 #include <libweston/libweston.h>
 #include <libweston/zalloc.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 
 #include <libweston/desktop.h>
 #include "internal.h"

libweston/desktop/xdg-shell.c

@@ -37,7 +37,7 @@
 
 #include <libweston/desktop.h>
 #include "internal.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 
 /************************************************************************************
  * WARNING: This file implements the stable xdg shell protocol.

libweston/gl-borders.c

@@ -29,7 +29,7 @@
 #include "config.h"
 
 #include "gl-borders.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 
 void
 weston_gl_borders_update(struct weston_gl_borders *borders,

libweston/id-number-allocator.c

@@ -25,9 +25,8 @@
 
 #include "config.h"
 
-#include <libweston/helpers.h>
-
 #include "id-number-allocator.h"
+#include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "shared/weston-assert.h"
 

libweston/input.c

@@ -40,7 +40,7 @@
 #include <errno.h>
 #include <linux/input.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "shared/timespec-util.h"
 #include <libweston/libweston.h>

libweston/libinput-device.c

@@ -39,10 +39,10 @@
 #include <libinput.h>
 
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
 #include "backend.h"
 #include "libweston-internal.h"
 #include "libinput-device.h"
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
 
 #include "tablet-unstable-v2-server-protocol.h"

libweston/libinput-seat.c

@@ -35,13 +35,13 @@
 #include <libudev.h>
 
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
 #include "backend.h"
 #include "libweston-internal.h"
 #include "weston-log-internal.h"
 #include "launcher-util.h"
 #include "libinput-seat.h"
 #include "libinput-device.h"
+#include "shared/helpers.h"
 
 static void
 process_events(struct udev_input *input);

libweston/linux-dmabuf.c

@@ -36,7 +36,7 @@
 #include "linux-dmabuf.h"
 #include "linux-dmabuf-unstable-v1-server-protocol.h"
 #include "shared/os-compatibility.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "libweston-internal.h"
 #include "shared/weston-assert.h"
 #include "shared/weston-drm-fourcc.h"

libweston/output-capture.c

@@ -32,7 +32,7 @@
 #include "libweston-internal.h"
 #include "output-capture.h"
 #include "pixel-formats.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/weston-drm-fourcc.h"
 #include "shared/xalloc.h"
 #include "weston-output-capture-server-protocol.h"

libweston/pixel-formats.c

@@ -37,7 +37,7 @@
 
 #include <xf86drm.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/string-helpers.h"
 #include "shared/weston-drm-fourcc.h"
 #include "shared/xalloc.h"

libweston/pixman-renderer.c

@@ -36,7 +36,7 @@
 #include "color.h"
 #include "pixel-formats.h"
 #include "output-capture.h"
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/weston-drm-fourcc.h"
 #include "shared/xalloc.h"
 

libweston/renderer-gl/egl-glue.c

@@ -29,7 +29,7 @@
 
 #include <assert.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/platform.h"
 #include "shared/string-helpers.h"
 

libweston/renderer-gl/gl-renderer-internal.h

@@ -65,7 +65,7 @@
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include "shared/weston-egl-ext.h"  /* for PFN* stuff */
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 
 /* Max number of images per buffer. */
 #define SHADER_INPUT_TEX_MAX 3

libweston/renderer-gl/gl-renderer.c

@@ -60,9 +60,8 @@
 #include "output-capture.h"
 #include "pixel-formats.h"
 
-#include <libweston/helpers.h>
-
 #include "shared/fd-util.h"
+#include "shared/helpers.h"
 #include "shared/platform.h"
 #include "shared/string-helpers.h"
 #include "shared/timespec-util.h"

libweston/renderer-gl/gl-shaders.c

@@ -36,7 +36,6 @@
 
 #include <libweston/libweston.h>
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
 #include <GLES2/gl2.h>
 
 #include <string.h>
@@ -44,6 +43,7 @@
 #include "gl-renderer.h"
 #include "gl-renderer-internal.h"
 #include "pixel-formats.h"
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
 
 /* static const char vertex_shader[]; vertex.glsl */

libweston/screenshooter.c

@@ -36,7 +36,7 @@
 #include <sys/uio.h>
 
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
 #include "backend.h"
 #include "libweston-internal.h"

libweston/shell-utils/shell-utils.c

@@ -27,7 +27,7 @@
 #include "config.h"
 #include <libweston/shell-utils.h>
 #include <libweston/desktop.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 
 /**
  * \defgroup shell-utils Shell utils

libweston/timeline.h

@@ -31,9 +31,10 @@
 #include <stdbool.h>
 
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
 #include <wayland-server-core.h>
 
+#include "shared/helpers.h"
+
 enum timeline_type {
 	TLT_END = 0,
 	TLT_OUTPUT,

libweston/touch-calibration.c

@@ -29,7 +29,7 @@
 #include <string.h>
 #include <wayland-server.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/string-helpers.h"
 #include <libweston/zalloc.h>
 #include "shared/timespec-util.h"

libweston/vertex-clipping.c

@@ -27,7 +27,7 @@
 #include <math.h>
 #include <string.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "vertex-clipping.h"
 
 struct clip_context {

libweston/weston-log-file.c

@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include <libweston/libweston.h>
 
 #include "weston-log-internal.h"

libweston/weston-log-flight-rec.c

@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include <libweston/libweston.h>
 
 #include "weston-log-internal.h"

libweston/weston-log-wayland.c

@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include <libweston/libweston.h>
 
 #include "weston-log-internal.h"

libweston/weston-log.c

@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include <libweston/weston-log.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include <libweston/libweston.h>
 
 #include "weston-log-internal.h"

remoting/remoting-plugin.c

@@ -44,7 +44,7 @@
 
 #include <libweston/remoting-plugin.h>
 #include <libweston/backend-drm.h>
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/timespec-util.h"
 #include "shared/weston-drm-fourcc.h"
 #include "shared/string-helpers.h"

shared/cairo-util.c

@@ -35,10 +35,10 @@
 #include <cairo.h>
 #include "cairo-util.h"
 
-#include <libweston/helpers.h>
-#include <libweston/config-parser.h>
+#include "shared/helpers.h"
 #include "image-loader.h"
 #include "shared/xalloc.h"
+#include <libweston/config-parser.h>
 
 #ifdef HAVE_PANGO
 #include <fontconfig/fontconfig.h>

shared/config-parser.c

@@ -42,7 +42,7 @@
 #include <libweston/zalloc.h>
 #include <libweston/config-parser.h>
 #include <libweston/libweston.h>
-#include <libweston/helpers.h>
+#include "helpers.h"
 #include "string-helpers.h"
 
 /**

shared/helpers.h

@@ -19,8 +19,10 @@
  * SOFTWARE.
  */
 
-#ifndef LIBWESTON_HELPERS_H
-#define LIBWESTON_HELPERS_H
+#ifndef WESTON_HELPERS_H
+#define WESTON_HELPERS_H
+
+#include "config.h"
 
 #include <stdint.h>
 

shared/image-loader.c

@@ -36,7 +36,7 @@
 #include <png.h>
 #include <pixman.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "shared/xalloc.h"
 #include "image-loader.h"

shared/process-util.c

@@ -35,7 +35,7 @@
 
 #include <wayland-util.h>
 
-#include <libweston/helpers.h>
+#include "helpers.h"
 #include "os-compatibility.h"
 #include "process-util.h"
 #include "string-helpers.h"

shared/timespec-util.h

@@ -30,7 +30,7 @@
 #include <assert.h>
 #include <time.h>
 #include <stdbool.h>
-#include <libweston/helpers.h>
+#include <shared/helpers.h>
 
 #define NSEC_PER_SEC 1000000000
 

shared/xcb-xwayland.c

@@ -32,7 +32,7 @@
 #include <stddef.h>
 #include <assert.h>
 
-#include <libweston/helpers.h>
+#include "shared/helpers.h"
 #include "xcb-xwayland.h"
 
 const char *

tests/color_util.c

@@ -33,9 +33,9 @@
 #include <stddef.h>
 
 #include <libweston/matrix.h>
-#include <libweston/helpers.h>
 #include "color_util.h"
 #include "weston-test-runner.h"
+#include "shared/helpers.h"
 
 static_assert(sizeof(struct color_float) == 4 * sizeof(float),
 	      "unexpected padding in struct color_float");

tests/config-parser-test.c

@@ -35,8 +35,8 @@
 #include <math.h>
 
 #include <libweston/config-parser.h>
-#include <libweston/helpers.h>
 
+#include "shared/helpers.h"
 #include "zunitc/zunitc.h"
 
 struct fixture_data {