From f1bba8e9bb63ff2193099a03ad1772c2a463e217 Mon Sep 17 00:00:00 2001
From: Andri Yngvason <andri@yngvason.is>
Date: Wed, 6 Jul 2022 21:09:02 +0000
Subject: [PATCH] Use quote-includes for all local headers

---
 include/open-h264.h     | 3 ++-
 include/rfb/rfbclient.h | 7 ++++---
 include/sasl.h          | 2 +-
 include/vnc.h           | 3 ++-
 src/cursor.c            | 3 +--
 src/open-h264.c         | 2 +-
 src/tls_gnutls.c        | 6 +++---
 src/tls_none.c          | 5 +++--
 src/tls_openssl.c       | 3 ++-
 9 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/include/open-h264.h b/include/open-h264.h
index 04396a6..d05dc6c 100644
--- a/include/open-h264.h
+++ b/include/open-h264.h
@@ -18,8 +18,9 @@
 
 #define OPEN_H264_MAX_CONTEXTS 64
 
+#include "rfb/rfbclient.h"
+
 #include <stdbool.h>
-#include <rfb/rfbclient.h>
 
 struct AVFrame;
 struct open_h264;
diff --git a/include/rfb/rfbclient.h b/include/rfb/rfbclient.h
index e6f382b..aac67d9 100644
--- a/include/rfb/rfbclient.h
+++ b/include/rfb/rfbclient.h
@@ -32,14 +32,15 @@
  * @file rfbclient.h
  */
 
+#include "rfb/rfbproto.h"
+#include "rfb/keysym.h"
+#include "rfb/threading.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <rfb/rfbproto.h>
-#include <rfb/keysym.h>
-#include <rfb/threading.h>
 
 #ifdef LIBVNCSERVER_HAVE_SASL
 #include <sasl/sasl.h>
diff --git a/include/sasl.h b/include/sasl.h
index 2936364..df45f59 100644
--- a/include/sasl.h
+++ b/include/sasl.h
@@ -22,7 +22,7 @@
 
 #ifdef LIBVNCSERVER_HAVE_SASL
 
-#include <rfb/rfbclient.h>
+#include "rfb/rfbclient.h"
 
 /*
  *  Perform the SASL authentication process
diff --git a/include/vnc.h b/include/vnc.h
index 72b890a..450d3bd 100644
--- a/include/vnc.h
+++ b/include/vnc.h
@@ -16,11 +16,12 @@
 
 #pragma once
 
+#include "rfb/rfbclient.h"
+
 #include <stdbool.h>
 #include <unistd.h>
 #include <pixman.h>
 #include <wayland-client.h>
-#include <rfb/rfbclient.h>
 
 #define VNC_CLIENT_MAX_AV_FRAMES 64
 
diff --git a/src/cursor.c b/src/cursor.c
index 0e5abe7..440a8ff 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -22,8 +22,7 @@
  * RichCursor preudo-encodings).
  */
 
-#include <rfb/rfbclient.h>
-
+#include "rfb/rfbclient.h"
 
 #define OPER_SAVE     0
 #define OPER_RESTORE  1
diff --git a/src/open-h264.c b/src/open-h264.c
index 18e85e4..a082a34 100644
--- a/src/open-h264.c
+++ b/src/open-h264.c
@@ -15,12 +15,12 @@
  */
 
 #include "open-h264.h"
+#include "rfb/rfbclient.h"
 
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
 #include <arpa/inet.h>
-#include <rfb/rfbclient.h>
 #include <libavcodec/avcodec.h>
 
 enum open_h264_flags {
diff --git a/src/tls_gnutls.c b/src/tls_gnutls.c
index b702f05..d6679e0 100644
--- a/src/tls_gnutls.c
+++ b/src/tls_gnutls.c
@@ -17,13 +17,13 @@
  *  USA.
  */
 
+#include "rfb/rfbclient.h"
+#include "tls.h"
+
 #include <stdio.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#include <rfb/rfbclient.h>
 #include <errno.h>
-#include "tls.h"
-
 
 static const char *rfbTLSPriority = "NORMAL:+DHE-DSS:+RSA:+DHE-RSA:+SRP";
 static const char *rfbAnonTLSPriority= "NORMAL:+ANON-DH";
diff --git a/src/tls_none.c b/src/tls_none.c
index d436ce9..fe60182 100644
--- a/src/tls_none.c
+++ b/src/tls_none.c
@@ -17,10 +17,11 @@
  *  USA.
  */
 
-#include <rfb/rfbclient.h>
-#include <errno.h>
+#include "rfb/rfbclient.h"
 #include "tls.h"
 
+#include <errno.h>
+
 rfbBool HandleAnonTLSAuth(rfbClient* client) 
 {
   rfbClientLog("TLS is not supported.\n");
diff --git a/src/tls_openssl.c b/src/tls_openssl.c
index df919b1..31555a9 100644
--- a/src/tls_openssl.c
+++ b/src/tls_openssl.c
@@ -18,8 +18,9 @@
  *  USA.
  */
 
+#include "rfb/rfbclient.h"
+
 #include <stdio.h>
-#include <rfb/rfbclient.h>
 #include <errno.h>
 
 #include <openssl/err.h>