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

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);
 

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))

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;
 

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;
 

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

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;

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

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)

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;

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,

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"

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)")