From c5241f5b73b0ff67fd8f4223da7e78636d1a2fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Tue, 22 Nov 2011 09:35:14 -0500
Subject: [PATCH] Never include wayland-util.h directly

And fix a missing "" to <> conversion for wayland-client.h include.
---
 clients/gears.c             | 1 -
 clients/resizor.c           | 1 -
 clients/terminal.c          | 1 -
 clients/view.c              | 1 -
 clients/window.c            | 1 -
 clients/wscreensaver-glue.h | 1 -
 clients/wscreensaver.c      | 3 +--
 compositor/compositor.h     | 1 -
 8 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/clients/gears.c b/clients/gears.c
index 1f3ab7d8..bc85f546 100644
--- a/clients/gears.c
+++ b/clients/gears.c
@@ -36,7 +36,6 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
-#include "wayland-util.h"
 #include <wayland-client.h>
 
 #include "window.h"
diff --git a/clients/resizor.c b/clients/resizor.c
index ede9429c..c3d0327a 100644
--- a/clients/resizor.c
+++ b/clients/resizor.c
@@ -27,7 +27,6 @@
 #include <cairo.h>
 #include <math.h>
 
-#include "wayland-util.h"
 #include <wayland-client.h>
 
 #include "window.h"
diff --git a/clients/terminal.c b/clients/terminal.c
index df2f8c77..86510736 100644
--- a/clients/terminal.c
+++ b/clients/terminal.c
@@ -36,7 +36,6 @@
 
 #include <X11/keysym.h>
 
-#include "wayland-util.h"
 #include <wayland-client.h>
 
 #include "window.h"
diff --git a/clients/view.c b/clients/view.c
index f5f8841c..9d8a99f1 100644
--- a/clients/view.c
+++ b/clients/view.c
@@ -37,7 +37,6 @@
 #include <glib/poppler-document.h>
 #include <glib/poppler-page.h>
 
-#include "wayland-util.h"
 #include <wayland-client.h>
 
 #include "window.h"
diff --git a/clients/window.c b/clients/window.c
index db48a399..1e317c70 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -50,7 +50,6 @@
 #include <X11/extensions/XKBcommon.h>
 
 #include <linux/input.h>
-#include "wayland-util.h"
 #include <wayland-client.h>
 #include "cairo-util.h"
 
diff --git a/clients/wscreensaver-glue.h b/clients/wscreensaver-glue.h
index 74c9e5c6..e07915f9 100644
--- a/clients/wscreensaver-glue.h
+++ b/clients/wscreensaver-glue.h
@@ -43,7 +43,6 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
-#include "wayland-util.h"
 #include "window.h"
 
 #define ENTRYPOINT static
diff --git a/clients/wscreensaver.c b/clients/wscreensaver.c
index 6070c5df..f00741ee 100644
--- a/clients/wscreensaver.c
+++ b/clients/wscreensaver.c
@@ -32,8 +32,7 @@
 #include <GL/gl.h>
 #include <EGL/eglext.h>
 
-#include "wayland-util.h"
-#include "wayland-client.h"
+#include <wayland-client.h>
 
 #include "window.h"
 
diff --git a/compositor/compositor.h b/compositor/compositor.h
index 30fb5cb8..b66903ae 100644
--- a/compositor/compositor.h
+++ b/compositor/compositor.h
@@ -26,7 +26,6 @@
 #include <libudev.h>
 #include <pixman.h>
 #include <wayland-server.h>
-#include "wayland-util.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>