[OS/2] cairo-os2 build fix that was already applied in upstream cairo

gfx/cairo/cairo/src/cairo-os2-private.h

@@ -41,17 +41,6 @@
 #include "cairo-os2.h"
 #include "cairoint.h"
 
-#define INCL_DOS
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSERRORS
-#define INCL_WIN
-#define INCL_GPI
-#ifdef __WATCOMC__
-# include <os2.h>
-#else
-# include <os2emx.h>
-#endif
-
 typedef struct _cairo_os2_surface
 {
     cairo_surface_t        base;

gfx/cairo/cairo/src/cairo-os2-surface.c

@@ -43,11 +43,6 @@
 
 #include <float.h>
 #ifdef BUILD_CAIRO_DLL
-# define INCL_WIN
-# define INCL_GPI
-# define INCL_DOS
-# define INCL_DOSERRORS
-# include <os2emx.h>
 # include "cairo-os2.h"
 # ifndef __WATCOMC__
 #  include <emx/startup.h>

gfx/cairo/cairo/src/cairo-os2.h

@@ -38,8 +38,16 @@
 #ifndef _CAIRO_OS2_H_
 #define _CAIRO_OS2_H_
 
+#define INCL_DOS
+#define INCL_DOSSEMAPHORES
+#define INCL_DOSERRORS
+#define INCL_WIN
+#define INCL_GPI
+
 #include "cairo.h"
 
+#include <os2.h>
+
 CAIRO_BEGIN_DECLS
 
 /* The OS/2 Specific Cairo API */