Fix inclusion of common files, no need for common/ part

14 files changed, 14 insertions, 14 deletions

diff --git a/client/monitor.h b/client/monitor.h
index 39d957d7..ec31da47 100644
--- a/client/monitor.h
+++ b/client/monitor.h
@@ -18,7 +18,7 @@
 #ifndef _H_MONITOR
 #define _H_MONITOR
 
-#include <common/draw.h>
+#include "draw.h"
 
 class Monitor {
 public:
diff --git a/client/pixels_source.h b/client/pixels_source.h
index 6e243003..fac9c22e 100644
--- a/client/pixels_source.h
+++ b/client/pixels_source.h
@@ -18,7 +18,7 @@
 #ifndef _H_PIXELS_SOURCE
 #define _H_PIXELS_SOURCE
 
-#include <common/draw.h>
+#include "draw.h"
 
 #define PIXELES_SOURCE_OPAQUE_SIZE (20 * sizeof(void*))
 
diff --git a/common/canvas_base.h b/common/canvas_base.h
index 55e1b337..0d25a3f1 100644
--- a/common/canvas_base.h
+++ b/common/canvas_base.h
@@ -23,7 +23,7 @@
 #include "pixman_utils.h"
 #include "lz.h"
 #include "region.h"
-#include <common/draw.h>
+#include "draw.h"
 
 typedef void (*spice_destroy_fn_t)(void *data);
 
diff --git a/common/draw.h b/common/draw.h
index 5741eff4..ab9da69c 100644
--- a/common/draw.h
+++ b/common/draw.h
@@ -33,7 +33,7 @@
 
 #include <spice/types.h>
 #include <spice/enums.h>
-#include <common/mem.h>
+#include "mem.h"
 
 #define SPICE_GET_ADDRESS(addr) ((void *)(unsigned long)(addr))
 #define SPICE_SET_ADDRESS(addr, val) ((addr) = (unsigned long)(val))
diff --git a/common/lines.h b/common/lines.h
index 8a60c03c..1d092f05 100644
--- a/common/lines.h
+++ b/common/lines.h
@@ -52,7 +52,7 @@ SOFTWARE.
 #include <pixman_utils.h>
 #include <stdlib.h>
 #include <string.h>
-#include <common/draw.h>
+#include "draw.h"
 
 typedef struct lineGC lineGC;
 
diff --git a/common/lz.h b/common/lz.h
index fb61e10e..993609f2 100644
--- a/common/lz.h
+++ b/common/lz.h
@@ -8,7 +8,7 @@
 
 #include "lz_common.h"
 #include "lz_config.h"
-#include <common/draw.h>
+#include "draw.h"
 
 typedef void *LzContext;
 
diff --git a/common/marshaller.h b/common/marshaller.h
index e7e66372..4d771401 100644
--- a/common/marshaller.h
+++ b/common/marshaller.h
@@ -20,7 +20,7 @@
 #define _H_MARSHALLER
 
 #include <spice/types.h>
-#include <common/mem.h>
+#include "mem.h"
 #ifndef WIN32
 #include <sys/uio.h>
 #endif
diff --git a/common/messages.h b/common/messages.h
index 4cbd80eb..a6433b02 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -32,7 +32,7 @@
 #define _H_MESSAGES
 
 #include <spice/protocol.h>
-#include <common/draw.h>
+#include "draw.h"
 
 typedef struct SpiceMsgData {
     uint32_t data_size;
diff --git a/common/pixman_utils.h b/common/pixman_utils.h
index 45a58cae..e15b682f 100644
--- a/common/pixman_utils.h
+++ b/common/pixman_utils.h
@@ -24,7 +24,7 @@
 #define PIXMAN_DONT_DEFINE_STDINT
 #include <pixman.h>
 
-#include <common/draw.h>
+#include "draw.h"
 
 /* This lists all possible 2 argument binary raster ops.
  * This enum has the same values as the X11 GXcopy type
diff --git a/common/rect.h b/common/rect.h
index 7d8e752d..cdd43350 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -19,7 +19,7 @@
 #ifndef _H_RECT
 #define _H_RECT
 
-#include <common/draw.h>
+#include "draw.h"
 #include <spice/macros.h>
 
 static inline void rect_sect(SpiceRect* r, const SpiceRect* bounds)
diff --git a/common/region.h b/common/region.h
index c90e06fc..bad7494f 100644
--- a/common/region.h
+++ b/common/region.h
@@ -20,7 +20,7 @@
 #define _H_REGION
 
 #include <stdint.h>
-#include <common/draw.h>
+#include "draw.h"
 #include <pixman_utils.h>
 
 typedef pixman_region32_t QRegion;
diff --git a/common/rop3.h b/common/rop3.h
index 15f31d45..02111308 100644
--- a/common/rop3.h
+++ b/common/rop3.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include <common/draw.h>
+#include "draw.h"
 #include "pixman_utils.h"
 
 void do_rop3_with_pattern(uint8_t rop3, pixman_image_t *d, pixman_image_t *s, SpicePoint *src_pos,
diff --git a/common/sw_canvas.h b/common/sw_canvas.h
index 2d551184..473bbc1a 100644
--- a/common/sw_canvas.h
+++ b/common/sw_canvas.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include <common/draw.h>
+#include "draw.h"
 #include "pixman_utils.h"
 #include "canvas_base.h"
 #include "region.h"
diff --git a/python_modules/demarshal.py b/python_modules/demarshal.py
index e8afabb2..96aa1461 100644
--- a/python_modules/demarshal.py
+++ b/python_modules/demarshal.py
@@ -1169,7 +1169,7 @@ def write_includes(writer):
     writer.writeln("#include <stdio.h>")
     writer.writeln("#include <spice/protocol.h>")
     writer.writeln("#include <spice/macros.h>")
-    writer.writeln("#include <common/mem.h>")
+    writer.writeln('#include "mem.h"')
     writer.newline()
     writer.writeln("#ifdef _MSC_VER")
     writer.writeln("#pragma warning(disable:4101)")