Remove include of cairoint.h from *-private.h header files.

These were recently added, (as part of sparse integration?), but they
break boilerplate which reaches into at least cairo-types-private.h
and cairo-scaled-font-private.h. But boilerplate cannot see cairoint.h
or else it gets the internal sybol renaming, (with the INT_ prefix),
and then all the test suite tests refuse to link.

If this change reverts some recently-added functionality, (or
cleanliness), then we'll just need to find some other way to add that
back again without the breakage.

24 files changed, 12 insertions, 32 deletions

diff --git a/src/cairo-cache-private.h b/src/cairo-cache-private.h
index 33599836d..7ab14e26c 100644
--- a/src/cairo-cache-private.h
+++ b/src/cairo-cache-private.h
@@ -39,7 +39,6 @@
 #ifndef CAIRO_CACHE_PRIVATE_H
 #define CAIRO_CACHE_PRIVATE_H
 
-#include "cairoint.h"
 #include "cairo-types-private.h"
 
 /**
diff --git a/src/cairo-clip-private.h b/src/cairo-clip-private.h
index 55ccb08b4..61559ce5b 100644
--- a/src/cairo-clip-private.h
+++ b/src/cairo-clip-private.h
@@ -36,7 +36,6 @@
 #ifndef CAIRO_CLIP_PRIVATE_H
 #define CAIRO_CLIP_PRIVATE_H
 
-#include "cairoint.h"
 #include "cairo-path-fixed-private.h"
 
 extern const cairo_private cairo_rectangle_list_t _cairo_rectangles_nil;
diff --git a/src/cairo-fixed-private.h b/src/cairo-fixed-private.h
index bcc7d0c95..35b3748d3 100644
--- a/src/cairo-fixed-private.h
+++ b/src/cairo-fixed-private.h
@@ -37,7 +37,6 @@
 #ifndef CAIRO_FIXED_PRIVATE_H
 #define CAIRO_FIXED_PRIVATE_H
 
-#include "cairoint.h"
 #include "cairo-wideint-private.h"
 
 /*
diff --git a/src/cairo-ft-private.h b/src/cairo-ft-private.h
index 55f86ee29..3e28f5e24 100644
--- a/src/cairo-ft-private.h
+++ b/src/cairo-ft-private.h
@@ -37,7 +37,6 @@
 #ifndef CAIRO_FT_PRIVATE_H
 #define CAIRO_FT_PRIVATE_H
 
-#include "cairoint.h"
 #include <cairo-ft.h>
 #include <cairoint.h>
 
diff --git a/src/cairo-gstate-private.h b/src/cairo-gstate-private.h
index 276ce9ff1..25900482c 100644
--- a/src/cairo-gstate-private.h
+++ b/src/cairo-gstate-private.h
@@ -36,7 +36,6 @@
 #ifndef CAIRO_GSTATE_PRIVATE_H
 #define CAIRO_GSTATE_PRIVATE_H
 
-#include "cairoint.h"
 #include "cairo-clip-private.h"
 
 struct _cairo_gstate {
diff --git a/src/cairo-hash-private.h b/src/cairo-hash-private.h
index b0c1e0067..8ed3ba83a 100644
--- a/src/cairo-hash-private.h
+++ b/src/cairo-hash-private.h
@@ -39,7 +39,6 @@
 #ifndef CAIRO_HASH_PRIVATE_H
 #define CAIRO_HASH_PRIVATE_H
 
-#include "cairoint.h"
 #include "cairo-types-private.h"
 
 /* XXX: I'd like this file to be self-contained in terms of
diff --git a/src/cairo-malloc-private.h b/src/cairo-malloc-private.h
index bd4795791..f503b3951 100644
--- a/src/cairo-malloc-private.h
+++ b/src/cairo-malloc-private.h
@@ -37,7 +37,6 @@
 #ifndef CAIRO_MALLOC_PRIVATE_H
 #define CAIRO_MALLOC_PRIVATE_H
 
-#include "cairoint.h"
 #include "cairo-wideint-private.h"
 
 /**
diff --git a/src/cairo-mutex-private.h b/src/cairo-mutex-private.h
index 7f61b1421..88e88bb0f 100644
--- a/src/cairo-mutex-private.h
+++ b/src/cairo-mutex-private.h
@@ -41,7 +41,9 @@
 #ifndef CAIRO_MUTEX_PRIVATE_H
 #define CAIRO_MUTEX_PRIVATE_H
 
-#include "cairoint.h"
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <cairo-features.h>
 
diff --git a/src/cairo-mutex-type-private.h b/src/cairo-mutex-type-private.h
index 1d82de82a..59d581afa 100644
--- a/src/cairo-mutex-type-private.h
+++ b/src/cairo-mutex-type-private.h
@@ -41,7 +41,9 @@
 #ifndef CAIRO_MUTEX_TYPE_PRIVATE_H
 #define CAIRO_MUTEX_TYPE_PRIVATE_H
 
-#include "cairoint.h"
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <cairo-features.h>
 
diff --git a/src/cairo-os2-private.h b/src/cairo-os2-private.h
index 5d67e09d1..71496ac7d 100644
--- a/src/cairo-os2-private.h
+++ b/src/cairo-os2-private.h
@@ -38,8 +38,6 @@
 #ifndef CAIRO_OS2_PRIVATE_H
 #define CAIRO_OS2_PRIVATE_H
 
-#include "cairoint.h"
-
 #define INCL_DOS
 #define INCL_DOSSEMAPHORES
 #define INCL_DOSERRORS
@@ -52,6 +50,7 @@
 #endif
 
 #include <cairo-os2.h>
+#include "cairoint.h"
 
 typedef struct _cairo_os2_surface
 {
diff --git a/src/cairo-output-stream-private.h b/src/cairo-output-stream-private.h
index 181285628..0600431ea 100644
--- a/src/cairo-output-stream-private.h
+++ b/src/cairo-output-stream-private.h
@@ -37,7 +37,6 @@
 #ifndef CAIRO_OUTPUT_STREAM_PRIVATE_H
 #define CAIRO_OUTPUT_STREAM_PRIVATE_H
 
-#include "cairoint.h"
 #include "cairo-types-private.h"
 
 typedef cairo_status_t (*cairo_output_stream_write_func_t) (cairo_output_stream_t *output_stream,
diff --git a/src/cairo-paginated-surface-private.h b/src/cairo-paginated-surface-private.h
index a9cea07ce..b406cac15 100644
--- a/src/cairo-paginated-surface-private.h
+++ b/src/cairo-paginated-surface-private.h
@@ -36,7 +36,7 @@
 #ifndef CAIRO_PAGINATED_SURFACE_H
 #define CAIRO_PAGINATED_SURFACE_H
 
-#include "cairoint.h"
+#include "cairo.h"
 
 #include "cairo-surface-private.h"
 
diff --git a/src/cairo-path-fixed-private.h b/src/cairo-path-fixed-private.h
index eedab581d..65401f349 100644
--- a/src/cairo-path-fixed-private.h
+++ b/src/cairo-path-fixed-private.h
@@ -36,8 +36,6 @@
 #ifndef CAIRO_PATH_FIXED_PRIVATE_H
 #define CAIRO_PATH_FIXED_PRIVATE_H
 
-#include "cairoint.h"
-
 typedef enum cairo_path_op {
     CAIRO_PATH_OP_MOVE_TO = 0,
     CAIRO_PATH_OP_LINE_TO = 1,
diff --git a/src/cairo-pdf-surface-private.h b/src/cairo-pdf-surface-private.h
index 7b00ad9ef..1af2ad06b 100644
--- a/src/cairo-pdf-surface-private.h
+++ b/src/cairo-pdf-surface-private.h
@@ -39,8 +39,6 @@
 #ifndef CAIRO_PDF_SURFACE_PRIVATE_H
 #define CAIRO_PDF_SURFACE_PRIVATE_H
 
-#include "cairoint.h"
-
 #include "cairo-pdf.h"
 
 #include "cairo-surface-private.h"
diff --git a/src/cairo-private.h b/src/cairo-private.h
index bca380e72..14cc79aea 100644
--- a/src/cairo-private.h
+++ b/src/cairo-private.h
@@ -36,7 +36,6 @@
 #ifndef CAIRO_PRIVATE_H
 #define CAIRO_PRIVATE_H
 
-#include "cairoint.h"
 #include "cairo-gstate-private.h"
 #include "cairo-path-fixed-private.h"
 
diff --git a/src/cairo-ps-surface-private.h b/src/cairo-ps-surface-private.h
index b6e243290..2499b992f 100644
--- a/src/cairo-ps-surface-private.h
+++ b/src/cairo-ps-surface-private.h
@@ -40,8 +40,6 @@
 #ifndef CAIRO_PS_SURFACE_PRIVATE_H
 #define CAIRO_PS_SURFACE_PRIVATE_H
 
-#include "cairoint.h"
-
 #include "cairo-ps.h"
 
 #include "cairo-surface-private.h"
diff --git a/src/cairo-region-private.h b/src/cairo-region-private.h
index 20be2fa36..7f92f9c1a 100644
--- a/src/cairo-region-private.h
+++ b/src/cairo-region-private.h
@@ -37,8 +37,6 @@
 #ifndef CAIRO_REGION_PRIVATE_H
 #define CAIRO_REGION_PRIVATE_H
 
-#include "cairoint.h"
-
 #include <pixman.h>
 
 /* cairo_region_t is defined in cairoint.h */
diff --git a/src/cairo-scaled-font-private.h b/src/cairo-scaled-font-private.h
index bd6245c5b..fa71644ae 100644
--- a/src/cairo-scaled-font-private.h
+++ b/src/cairo-scaled-font-private.h
@@ -38,7 +38,7 @@
 #ifndef CAIRO_SCALED_FONT_PRIVATE_H
 #define CAIRO_SCALED_FONT_PRIVATE_H
 
-#include "cairoint.h"
+#include "cairo.h"
 
 #include "cairo-types-private.h"
 #include "cairo-mutex-type-private.h"
diff --git a/src/cairo-surface-private.h b/src/cairo-surface-private.h
index 85b29f700..6193cf805 100644
--- a/src/cairo-surface-private.h
+++ b/src/cairo-surface-private.h
@@ -38,7 +38,7 @@
 #ifndef CAIRO_SURFACE_PRIVATE_H
 #define CAIRO_SURFACE_PRIVATE_H
 
-#include "cairoint.h"
+#include "cairo.h"
 
 #include "cairo-types-private.h"
 
diff --git a/src/cairo-svg-surface-private.h b/src/cairo-svg-surface-private.h
index ee5cf498f..e7cd4db8c 100644
--- a/src/cairo-svg-surface-private.h
+++ b/src/cairo-svg-surface-private.h
@@ -41,8 +41,6 @@
 #ifndef CAIRO_SVG_SURFACE_PRIVATE_H
 #define CAIRO_SVG_SURFACE_PRIVATE_H
 
-#include "cairoint.h"
-
 #include "cairo-svg.h"
 
 #include "cairo-surface-private.h"
diff --git a/src/cairo-type1-private.h b/src/cairo-type1-private.h
index 03b003966..ae28e058d 100644
--- a/src/cairo-type1-private.h
+++ b/src/cairo-type1-private.h
@@ -36,8 +36,6 @@
 #ifndef CAIRO_TYPE1_PRIVATE_H
 #define CAIRO_TYPE1_PRIVATE_H
 
-#include "cairoint.h"
-
 /* Magic constants for the type1 eexec encryption */
 #define CAIRO_TYPE1_ENCRYPT_C1		((unsigned short) 52845)
 #define CAIRO_TYPE1_ENCRYPT_C2		((unsigned short) 22719)
diff --git a/src/cairo-wideint-private.h b/src/cairo-wideint-private.h
index 78110636f..636d8a6b7 100644
--- a/src/cairo-wideint-private.h
+++ b/src/cairo-wideint-private.h
@@ -37,8 +37,6 @@
 #ifndef CAIRO_WIDEINT_H
 #define CAIRO_WIDEINT_H
 
-#include "cairoint.h"
-
 #if   HAVE_STDINT_H
 # include <stdint.h>
 #elif HAVE_INTTYPES_H
diff --git a/src/cairo-xlib-surface-private.h b/src/cairo-xlib-surface-private.h
index 16e5868c0..3bbf43e23 100644
--- a/src/cairo-xlib-surface-private.h
+++ b/src/cairo-xlib-surface-private.h
@@ -33,8 +33,6 @@
 #ifndef CAIRO_XLIB_SURFACE_PRIVATE_H
 #define CAIRO_XLIB_SURFACE_PRIVATE_H
 
-#include "cairoint.h"
-
 #include "cairo-xlib.h"
 
 #include "cairo-surface-private.h"
diff --git a/src/cairoint.h b/src/cairoint.h
index 310fdfdbc..7b11aafc4 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -43,6 +43,8 @@
  * existing published interfaces. cworth@cworth.org
  */
 
+#error Stay out!
+
 #ifndef _CAIROINT_H_
 #define _CAIROINT_H_