Use the new header names

I just ran:
 find -name "*.[ch]" | xargs sed -i -f ../spice-protocol/includes.sed
 find -name "*.cpp" | xargs sed -i -f ../spice-protocol/includes.sed

29 files changed, 33 insertions, 33 deletions

diff --git a/client/canvas.h b/client/canvas.h
index ed9d0e8a..84a654a8 100644
--- a/client/canvas.h
+++ b/client/canvas.h
@@ -21,7 +21,7 @@
 #include "common.h"
 #include "debug.h"
 #include "cairo.h"
-#include "red.h"
+#include <spice/protocol.h>
 #include "cache.hpp"
 #include "shared_cache.hpp"
 #include "canvas_utils.h"
diff --git a/client/client_net_socket.cpp b/client/client_net_socket.cpp
index 312d6bf8..e7a24896 100644
--- a/client/client_net_socket.cpp
+++ b/client/client_net_socket.cpp
@@ -22,7 +22,7 @@
 #include "common.h"
 #include "client_net_socket.h"
 #include "debug.h"
-#include "red_error_codes.h"
+#include <spice/error_codes.h>
 #include "utils.h"
 
 ClientNetSocket::ClientNetSocket(uint16_t id, const struct in_addr& dst_addr, uint16_t dst_port,
diff --git a/client/cursor.h b/client/cursor.h
index cc64c720..5f7ebb25 100644
--- a/client/cursor.h
+++ b/client/cursor.h
@@ -19,7 +19,7 @@
 #define _H_CURSOR_
 
 #include "threads.h"
-#include "red.h"
+#include <spice/protocol.h>
 #include "red_window_p.h"
 
 class CursorOpaque {
diff --git a/client/glz_decoder.h b/client/glz_decoder.h
index 87cb747c..c2afa54e 100644
--- a/client/glz_decoder.h
+++ b/client/glz_decoder.h
@@ -21,7 +21,7 @@
 #include "lz_common.h"
 #include "glz_decoder_config.h"
 #include "glz_decoder_window.h"
-#include "draw.h"
+#include <spice/draw.h>
 
 
 
diff --git a/client/monitor.h b/client/monitor.h
index 46b0a4e2..6714f74b 100644
--- a/client/monitor.h
+++ b/client/monitor.h
@@ -18,7 +18,7 @@
 #ifndef _H_MONITOR
 #define _H_MONITOR
 
-#include "draw.h"
+#include <spice/draw.h>
 
 class Monitor {
 public:
diff --git a/client/pixels_source.h b/client/pixels_source.h
index e2fe0604..faa2d4f6 100644
--- a/client/pixels_source.h
+++ b/client/pixels_source.h
@@ -18,7 +18,7 @@
 #ifndef _H_PIXELS_SOURCE
 #define _H_PIXELS_SOURCE
 
-#include "draw.h"
+#include <spice/draw.h>
 
 #define PIXELES_SOURCE_OPAQUE_SIZE (20 * sizeof(void*))
 
diff --git a/client/red_client.h b/client/red_client.h
index 037896ac..e62ed77b 100644
--- a/client/red_client.h
+++ b/client/red_client.h
@@ -27,8 +27,8 @@
 #include "inputs_channel.h"
 #include "cursor_channel.h"
 #include "audio_channels.h"
-#include "red.h"
-#include "vd_agent.h"
+#include <spice/protocol.h>
+#include <spice/vd_agent.h>
 #include "process_loop.h"
 
 class Application;
diff --git a/client/red_peer.cpp b/client/red_peer.cpp
index f12be5a6..bdbf1ff1 100644
--- a/client/red_peer.cpp
+++ b/client/red_peer.cpp
@@ -18,7 +18,7 @@
 #include "common.h"
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "red.h"
+#include <spice/protocol.h>
 #include "red_peer.h"
 #include "utils.h"
 #include "debug.h"
diff --git a/client/red_peer.h b/client/red_peer.h
index 8b10a5ec..cb5f868d 100644
--- a/client/red_peer.h
+++ b/client/red_peer.h
@@ -22,7 +22,7 @@
 #include <openssl/err.h>
 
 #include "common.h"
-#include "red.h"
+#include <spice/protocol.h>
 #include "process_loop.h"
 #include "threads.h"
 #include "platform_utils.h"
diff --git a/client/red_window.h b/client/red_window.h
index 707b9027..27bb4f78 100644
--- a/client/red_window.h
+++ b/client/red_window.h
@@ -19,7 +19,7 @@
 #define _H_RED_WINDOW
 
 #include "red_drawable.h"
-#include "red.h"
+#include <spice/protocol.h>
 #include "red_key.h"
 #include "red_window_p.h"
 #include "cursor.h"
diff --git a/client/tunnel_channel.cpp b/client/tunnel_channel.cpp
index dd50933d..383944f6 100644
--- a/client/tunnel_channel.cpp
+++ b/client/tunnel_channel.cpp
@@ -21,7 +21,7 @@
 
 #include "common.h"
 #include "tunnel_channel.h"
-#include "red.h"
+#include <spice/protocol.h>
 
 #define SOCKET_WINDOW_SIZE 60
 #define SOCKET_TOKENS_TO_SEND 20
diff --git a/client/utils.h b/client/utils.h
index d4163b87..9a29cfbc 100644
--- a/client/utils.h
+++ b/client/utils.h
@@ -19,7 +19,7 @@
 #define _H_UTILS
 
 #include "common.h"
-#include "red_error_codes.h"
+#include <spice/error_codes.h>
 
 #define MIN(x, y) (((x) <= (y)) ? (x) : (y))
 #define MAX(x, y) (((x) >= (y)) ? (x) : (y))
diff --git a/client/windows/red_window.cpp b/client/windows/red_window.cpp
index a2522d9f..0464e59a 100644
--- a/client/windows/red_window.cpp
+++ b/client/windows/red_window.cpp
@@ -20,7 +20,7 @@
 #include "pixels_source_p.h"
 #include "utils.h"
 #include "debug.h"
-#include "red.h"
+#include <spice/protocol.h>
 #include "menu.h"
 #include "win_platform.h"
 #include "platform_utils.h"
diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp
index 14394982..49c5533c 100644
--- a/client/x11/red_window.cpp
+++ b/client/x11/red_window.cpp
@@ -36,7 +36,7 @@
 #include "platform.h"
 #include "x_platform.h"
 #include "pixels_source_p.h"
-#include "red.h"
+#include <spice/protocol.h>
 #include "region.h"
 #include "red_pixmap_gl.h"
 #include "red_pixmap_gl.h"
diff --git a/common/cairo_canvas.h b/common/cairo_canvas.h
index da4d229e..72abcb21 100644
--- a/common/cairo_canvas.h
+++ b/common/cairo_canvas.h
@@ -20,7 +20,7 @@
 
 #include <stdint.h>
 
-#include "draw.h"
+#include <spice/draw.h>
 #include "cairo.h"
 #include "canvas_base.h"
 #include "region.h"
diff --git a/common/canvas_base.c b/common/canvas_base.c
index e4055933..fe9ef9b7 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -21,7 +21,7 @@
 #include <setjmp.h>
 #include <stdio.h>
 
-#include "draw.h"
+#include <spice/draw.h>
 #include "quic.h"
 #include "lz.h"
 #include "canvas_base.h"
diff --git a/common/canvas_base.h b/common/canvas_base.h
index 8a574e2a..ad73bb9a 100644
--- a/common/canvas_base.h
+++ b/common/canvas_base.h
@@ -21,7 +21,7 @@
 
 #include "cairo.h"
 #include "lz.h"
-#include "draw.h"
+#include <spice/draw.h>
 
 #if defined(CAIRO_CANVAS_CACHE) || defined(CAIRO_CANVAS_IMAGE_CACHE)
 typedef void (*bits_cache_put_fn_t)(void *bits_cache_opaque, uint64_t id, cairo_surface_t *surface);
diff --git a/common/gdi_canvas.h b/common/gdi_canvas.h
index 0f518508..8ba3f202 100644
--- a/common/gdi_canvas.h
+++ b/common/gdi_canvas.h
@@ -20,7 +20,7 @@
 
 #include <stdint.h>
 
-#include "draw.h"
+#include <spice/draw.h>
 #include "cairo.h"
 #include "canvas_base.h"
 #include "region.h"
diff --git a/common/gl_canvas.h b/common/gl_canvas.h
index 177c99d0..442c9f4e 100644
--- a/common/gl_canvas.h
+++ b/common/gl_canvas.h
@@ -16,7 +16,7 @@
 */
 
 #include "glc.h"
-#include "draw.h"
+#include <spice/draw.h>
 #include "canvas_base.h"
 #include "region.h"
 
diff --git a/common/lz.h b/common/lz.h
index 3fe1b4c8..0444dc83 100644
--- a/common/lz.h
+++ b/common/lz.h
@@ -7,7 +7,7 @@
 
 #include "lz_common.h"
 #include "lz_config.h"
-#include "draw.h"
+#include <spice/draw.h>
 
 typedef void *LzContext;
 
diff --git a/common/rect.h b/common/rect.h
index d109cc97..61de99c2 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -18,7 +18,7 @@
 #ifndef _H_RECT
 #define _H_RECT
 
-#include "draw.h"
+#include <spice/draw.h>
 
 #define MIN(x, y) (((x) <= (y)) ? (x) : (y))
 #define MAX(x, y) (((x) >= (y)) ? (x) : (y))
diff --git a/common/region.h b/common/region.h
index 73f8ed9d..e685bfba 100644
--- a/common/region.h
+++ b/common/region.h
@@ -19,7 +19,7 @@
 #define _H_REGION
 
 #include <stdint.h>
-#include "draw.h"
+#include <spice/draw.h>
 
 #define REGION_USE_IMPROVED
 
diff --git a/common/rop3.h b/common/rop3.h
index 31cbcdaa..3a24ece2 100644
--- a/common/rop3.h
+++ b/common/rop3.h
@@ -20,7 +20,7 @@
 
 #include <stdint.h>
 
-#include "draw.h"
+#include <spice/draw.h>
 #include "cairo.h"
 
 void do_rop3_with_pattern(uint8_t rop3, cairo_surface_t *d, cairo_surface_t *s, SpicePoint *src_pos,
diff --git a/server/red_common.h b/server/red_common.h
index f505868c..6a43dc3a 100644
--- a/server/red_common.h
+++ b/server/red_common.h
@@ -21,7 +21,7 @@
 #include <sys/uio.h>
 #include <openssl/ssl.h>
 
-#include "red.h"
+#include <spice/protocol.h>
 
 #ifndef MIN
 #define MIN(x, y) (((x) <= (y)) ? (x) : (y))
diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c
index d829805e..27274c8c 100644
--- a/server/red_dispatcher.c
+++ b/server/red_dispatcher.c
@@ -24,7 +24,7 @@
 #include <sys/socket.h>
 #include <signal.h>
 
-#include "qxl_dev.h"
+#include <spice/qxl_dev.h>
 #include "vd_interface.h"
 #include "red_worker.h"
 #include "quic.h"
diff --git a/server/red_tunnel_worker.c b/server/red_tunnel_worker.c
index a2a4eca2..9a8c11ef 100644
--- a/server/red_tunnel_worker.c
+++ b/server/red_tunnel_worker.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include "red_tunnel_worker.h"
 #include "red_common.h"
-#include "red.h"
+#include <spice/protocol.h>
 #include "reds.h"
 #include "net_slirp.h"
 #include "red_channel.h"
diff --git a/server/red_worker.c b/server/red_worker.c
index 9d6c08e5..483c5a3c 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -30,10 +30,10 @@
 #include <setjmp.h>
 #include <openssl/ssl.h>
 
-#include "qxl_dev.h"
+#include <spice/qxl_dev.h>
 #include "vd_interface.h"
 #include "region.h"
-#include "red.h"
+#include <spice/protocol.h>
 #include "red_worker.h"
 #include "cairo.h"
 #include "cairo_canvas.h"
diff --git a/server/reds.c b/server/reds.c
index bb71ae74..7b8d15b3 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -40,14 +40,14 @@
 
 #include "spice.h"
 #include "reds.h"
-#include "red.h"
-#include "vd_agent.h"
+#include <spice/protocol.h>
+#include <spice/vd_agent.h>
 
 #include "red_common.h"
 #include "red_dispatcher.h"
 #include "snd_worker.h"
 #include "red_tunnel_worker.h"
-#include "reds_stat.h"
+#include <spice/stats.h>
 #include "stat.h"
 #include "ring.h"
 #include "config.h"
diff --git a/tools/reds_stat.c b/tools/reds_stat.c
index f77d8db0..13599728 100644
--- a/tools/reds_stat.c
+++ b/tools/reds_stat.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "reds_stat.h"
+#include <spice/stats.h>
 
 #define TAB_LEN 4
 #define VALUE_TABS 7