[qemu-deps] Rebuild with zlib 1.2.10

Change-Id: I76d78c0fab34560faf07b48f2eed5e86ff2f26ee
diff --git a/darwin-x86_64/bin/envsubst b/darwin-x86_64/bin/envsubst
index 594d249..8471042 100755
--- a/darwin-x86_64/bin/envsubst
+++ b/darwin-x86_64/bin/envsubst
Binary files differ
diff --git a/darwin-x86_64/bin/gdbus b/darwin-x86_64/bin/gdbus
index 425045a..56d6ed8 100755
--- a/darwin-x86_64/bin/gdbus
+++ b/darwin-x86_64/bin/gdbus
Binary files differ
diff --git a/darwin-x86_64/bin/gettext b/darwin-x86_64/bin/gettext
index 6e500b4..87c03d0 100755
--- a/darwin-x86_64/bin/gettext
+++ b/darwin-x86_64/bin/gettext
Binary files differ
diff --git a/darwin-x86_64/bin/gio-querymodules b/darwin-x86_64/bin/gio-querymodules
index 331ff65..a67ff6c 100755
--- a/darwin-x86_64/bin/gio-querymodules
+++ b/darwin-x86_64/bin/gio-querymodules
Binary files differ
diff --git a/darwin-x86_64/bin/glib-compile-resources b/darwin-x86_64/bin/glib-compile-resources
index 86bec50..8724d4b 100755
--- a/darwin-x86_64/bin/glib-compile-resources
+++ b/darwin-x86_64/bin/glib-compile-resources
Binary files differ
diff --git a/darwin-x86_64/bin/glib-compile-schemas b/darwin-x86_64/bin/glib-compile-schemas
index 16b9850..52ed3de 100755
--- a/darwin-x86_64/bin/glib-compile-schemas
+++ b/darwin-x86_64/bin/glib-compile-schemas
Binary files differ
diff --git a/darwin-x86_64/bin/glib-genmarshal b/darwin-x86_64/bin/glib-genmarshal
index a66a152..ad7645d 100755
--- a/darwin-x86_64/bin/glib-genmarshal
+++ b/darwin-x86_64/bin/glib-genmarshal
Binary files differ
diff --git a/darwin-x86_64/bin/gobject-query b/darwin-x86_64/bin/gobject-query
index 4104b1a..5044da9 100755
--- a/darwin-x86_64/bin/gobject-query
+++ b/darwin-x86_64/bin/gobject-query
Binary files differ
diff --git a/darwin-x86_64/bin/gresource b/darwin-x86_64/bin/gresource
index 96235ee..42d775b 100755
--- a/darwin-x86_64/bin/gresource
+++ b/darwin-x86_64/bin/gresource
Binary files differ
diff --git a/darwin-x86_64/bin/gsettings b/darwin-x86_64/bin/gsettings
index 824ca9b..92f88a8 100755
--- a/darwin-x86_64/bin/gsettings
+++ b/darwin-x86_64/bin/gsettings
Binary files differ
diff --git a/darwin-x86_64/bin/gtester b/darwin-x86_64/bin/gtester
index 631d0e2..dfa6f82 100755
--- a/darwin-x86_64/bin/gtester
+++ b/darwin-x86_64/bin/gtester
Binary files differ
diff --git a/darwin-x86_64/bin/iconv b/darwin-x86_64/bin/iconv
index bb4ce08..7f58fa8 100755
--- a/darwin-x86_64/bin/iconv
+++ b/darwin-x86_64/bin/iconv
Binary files differ
diff --git a/darwin-x86_64/bin/msgattrib b/darwin-x86_64/bin/msgattrib
index 7c3e72a..26c8edb 100755
--- a/darwin-x86_64/bin/msgattrib
+++ b/darwin-x86_64/bin/msgattrib
Binary files differ
diff --git a/darwin-x86_64/bin/msgcat b/darwin-x86_64/bin/msgcat
index f6f8260..48ec2e7 100755
--- a/darwin-x86_64/bin/msgcat
+++ b/darwin-x86_64/bin/msgcat
Binary files differ
diff --git a/darwin-x86_64/bin/msgcmp b/darwin-x86_64/bin/msgcmp
index 27cc42c..2d492ef 100755
--- a/darwin-x86_64/bin/msgcmp
+++ b/darwin-x86_64/bin/msgcmp
Binary files differ
diff --git a/darwin-x86_64/bin/msgcomm b/darwin-x86_64/bin/msgcomm
index 51a1c96..5f0a175 100755
--- a/darwin-x86_64/bin/msgcomm
+++ b/darwin-x86_64/bin/msgcomm
Binary files differ
diff --git a/darwin-x86_64/bin/msgconv b/darwin-x86_64/bin/msgconv
index 00a17e8..6196842 100755
--- a/darwin-x86_64/bin/msgconv
+++ b/darwin-x86_64/bin/msgconv
Binary files differ
diff --git a/darwin-x86_64/bin/msgen b/darwin-x86_64/bin/msgen
index c9da75f..148f2a5 100755
--- a/darwin-x86_64/bin/msgen
+++ b/darwin-x86_64/bin/msgen
Binary files differ
diff --git a/darwin-x86_64/bin/msgexec b/darwin-x86_64/bin/msgexec
index 0ec179e..6923adb 100755
--- a/darwin-x86_64/bin/msgexec
+++ b/darwin-x86_64/bin/msgexec
Binary files differ
diff --git a/darwin-x86_64/bin/msgfilter b/darwin-x86_64/bin/msgfilter
index 87882c6..7c315f6 100755
--- a/darwin-x86_64/bin/msgfilter
+++ b/darwin-x86_64/bin/msgfilter
Binary files differ
diff --git a/darwin-x86_64/bin/msgfmt b/darwin-x86_64/bin/msgfmt
index c2da235..9b899e8 100755
--- a/darwin-x86_64/bin/msgfmt
+++ b/darwin-x86_64/bin/msgfmt
Binary files differ
diff --git a/darwin-x86_64/bin/msggrep b/darwin-x86_64/bin/msggrep
index 3e8d665..89cb5a7 100755
--- a/darwin-x86_64/bin/msggrep
+++ b/darwin-x86_64/bin/msggrep
Binary files differ
diff --git a/darwin-x86_64/bin/msginit b/darwin-x86_64/bin/msginit
index e53ade8..5ca2954 100755
--- a/darwin-x86_64/bin/msginit
+++ b/darwin-x86_64/bin/msginit
Binary files differ
diff --git a/darwin-x86_64/bin/msgmerge b/darwin-x86_64/bin/msgmerge
index 3731351..0037d22 100755
--- a/darwin-x86_64/bin/msgmerge
+++ b/darwin-x86_64/bin/msgmerge
Binary files differ
diff --git a/darwin-x86_64/bin/msgunfmt b/darwin-x86_64/bin/msgunfmt
index 3c72c4d..d858bc9 100755
--- a/darwin-x86_64/bin/msgunfmt
+++ b/darwin-x86_64/bin/msgunfmt
Binary files differ
diff --git a/darwin-x86_64/bin/msguniq b/darwin-x86_64/bin/msguniq
index c4c6c63..11ee4e8 100755
--- a/darwin-x86_64/bin/msguniq
+++ b/darwin-x86_64/bin/msguniq
Binary files differ
diff --git a/darwin-x86_64/bin/ngettext b/darwin-x86_64/bin/ngettext
index 7d25832..f20d091 100755
--- a/darwin-x86_64/bin/ngettext
+++ b/darwin-x86_64/bin/ngettext
Binary files differ
diff --git a/darwin-x86_64/bin/pkg-config b/darwin-x86_64/bin/pkg-config
index 991821d..6b721b1 100755
--- a/darwin-x86_64/bin/pkg-config
+++ b/darwin-x86_64/bin/pkg-config
Binary files differ
diff --git a/darwin-x86_64/bin/png-fix-itxt b/darwin-x86_64/bin/png-fix-itxt
index ef1677a..8307e5b 100755
--- a/darwin-x86_64/bin/png-fix-itxt
+++ b/darwin-x86_64/bin/png-fix-itxt
Binary files differ
diff --git a/darwin-x86_64/bin/pngfix b/darwin-x86_64/bin/pngfix
index 302cc2c..834b274 100755
--- a/darwin-x86_64/bin/pngfix
+++ b/darwin-x86_64/bin/pngfix
Binary files differ
diff --git a/darwin-x86_64/bin/recode-sr-latin b/darwin-x86_64/bin/recode-sr-latin
index 37b76cc..2d27474 100755
--- a/darwin-x86_64/bin/recode-sr-latin
+++ b/darwin-x86_64/bin/recode-sr-latin
Binary files differ
diff --git a/darwin-x86_64/bin/xgettext b/darwin-x86_64/bin/xgettext
index 7eac47c..24291d8 100755
--- a/darwin-x86_64/bin/xgettext
+++ b/darwin-x86_64/bin/xgettext
Binary files differ
diff --git a/darwin-x86_64/include/libpng16/pnglibconf.h b/darwin-x86_64/include/libpng16/pnglibconf.h
index 42a195b..13a566c 100644
--- a/darwin-x86_64/include/libpng16/pnglibconf.h
+++ b/darwin-x86_64/include/libpng16/pnglibconf.h
@@ -198,7 +198,7 @@
 #define PNG_TEXT_Z_DEFAULT_STRATEGY 0
 #define PNG_WEIGHT_SHIFT 8
 #define PNG_ZBUF_SIZE 8192
-#define PNG_ZLIB_VERNUM 0x1280
+#define PNG_ZLIB_VERNUM 0x12a0
 #define PNG_Z_DEFAULT_COMPRESSION (-1)
 #define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
 #define PNG_Z_DEFAULT_STRATEGY 1
diff --git a/darwin-x86_64/include/zconf.h b/darwin-x86_64/include/zconf.h
index 996fff2..77398c1 100644
--- a/darwin-x86_64/include/zconf.h
+++ b/darwin-x86_64/include/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -17,7 +17,7 @@
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
 #  define Z_PREFIX_SET
 
-/* all linked symbols */
+/* all linked symbols and init macros */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
@@ -29,6 +29,7 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
 #  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
@@ -37,10 +38,14 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
 #  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
@@ -67,6 +72,8 @@
 #    define gzeof                 z_gzeof
 #    define gzerror               z_gzerror
 #    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
 #    define gzgetc                z_gzgetc
 #    define gzgetc_               z_gzgetc_
 #    define gzgets                z_gzgets
@@ -78,7 +85,6 @@
 #      define gzopen_w              z_gzopen_w
 #    endif
 #    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
 #    define gzread                z_gzread
@@ -89,32 +95,39 @@
 #    define gztell                z_gztell
 #    define gztell64              z_gztell64
 #    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
 #    define gzwrite               z_gzwrite
 #  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
 #  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
 #  define inflateCopy           z_inflateCopy
 #  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
 #  define inflateInit2_         z_inflateInit2_
 #  define inflateInit_          z_inflateInit_
 #  define inflateMark           z_inflateMark
 #  define inflatePrime          z_inflatePrime
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
 #  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateValidate       z_inflateValidate
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
 #  ifndef Z_SOLO
 #    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
 #  endif
 #  define zError                z_zError
 #  ifndef Z_SOLO
@@ -224,9 +237,19 @@
 #  define z_const
 #endif
 
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
 #endif
 
 /* Maximum value for memLevel in deflateInit2 */
@@ -256,7 +279,7 @@
  Of course this will generally degrade compression (there's no free lunch).
 
    The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
  for small objects.
 */
 
diff --git a/darwin-x86_64/include/zlib.h b/darwin-x86_64/include/zlib.h
index 3e0c767..dc90dc8 100644
--- a/darwin-x86_64/include/zlib.h
+++ b/darwin-x86_64/include/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
+  version 1.2.10, January 2nd, 2017
 
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
+#define ZLIB_VERSION "1.2.10"
+#define ZLIB_VERNUM 0x12a0
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_REVISION 10
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -65,7 +65,8 @@
   with "gz".  The gzip format is different from the zlib format.  gzip is a
   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
 
-    This library can optionally read and write gzip streams in memory as well.
+    This library can optionally read and write gzip and raw deflate streams in
+  memory as well.
 
     The zlib format was designed to be compact and fast for use in memory
   and on communications channels.  The gzip format was designed for single-
@@ -74,7 +75,7 @@
 
     The library does not install any signal handler.  The decoder checks
   the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
+  even in the case of corrupted input.
 */
 
 typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -87,7 +88,7 @@
     uInt     avail_in;  /* number of bytes available at next_in */
     uLong    total_in;  /* total number of input bytes read so far */
 
-    Bytef    *next_out; /* next output byte should be put there */
+    Bytef    *next_out; /* next output byte will go here */
     uInt     avail_out; /* remaining free space at next_out */
     uLong    total_out; /* total number of bytes output so far */
 
@@ -98,8 +99,9 @@
     free_func  zfree;   /* used to free the internal state */
     voidpf     opaque;  /* private data object passed to zalloc and zfree */
 
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
+    int     data_type;  /* best guess about the data type: binary or text
+                           for deflate, or the decoding state for inflate */
+    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
     uLong   reserved;   /* reserved for future use */
 } z_stream;
 
@@ -142,7 +144,9 @@
 
      zalloc must return Z_NULL if there is not enough memory for the object.
    If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
+   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
+   Z_NULL on entry to the initialization function, they are set to internal
+   routines that use the standard library functions malloc() and free().
 
      On 16-bit systems, the functions zalloc and zfree must be able to allocate
    exactly 65536 bytes, but will not be required to allocate more than this if
@@ -155,7 +159,7 @@
 
      The fields total_in and total_out can be used for statistics or progress
    reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
+   uncompressed data and may be saved for use by the decompressor (particularly
    if the decompressor wants to decompress everything in a single step).
 */
 
@@ -200,7 +204,7 @@
 #define Z_TEXT     1
 #define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
 #define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
+/* Possible values of the data_type field for deflate() */
 
 #define Z_DEFLATED   8
 /* The deflate compression method (the only one supported in this version) */
@@ -258,11 +262,11 @@
     enough room in the output buffer), next_in and avail_in are updated and
     processing will resume at this point for the next call of deflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  This action is forced if the parameter flush is non zero.
     Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
+    should be set only when necessary.  Some output may be provided even if
+    flush is zero.
 
     Before the call of deflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
@@ -271,7 +275,9 @@
   output when it wants, for example when the output buffer is full (avail_out
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
+  buffer because there might be more output pending. See deflatePending(),
+  which can be used if desired to determine whether or not there is more ouput
+  in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
   decide how much data to accumulate before producing output, in order to
@@ -292,8 +298,8 @@
   input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
   This completes the current deflate block and follows it with an empty fixed
   codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
+  in order for the decompressor to finish the block before the empty fixed
+  codes block.
 
     If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
   for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
@@ -319,34 +325,38 @@
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
   pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
+  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
+  function must be called again with Z_FINISH and more output space (updated
+  avail_out) but no more input data, until it returns with Z_STREAM_END or an
+  error.  After deflate has returned Z_STREAM_END, the only possible operations
+  on the stream are deflateReset or deflateEnd.
 
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
-  not return Z_STREAM_END, and it must be called again as described above.
+    Z_FINISH can be used in the first deflate call after deflateInit if all the
+  compression is to be done in a single step.  In order to complete in one
+  call, avail_out must be at least the value returned by deflateBound (see
+  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
+  output space is provided, deflate will not return Z_STREAM_END, and it must
+  be called again as described above.
 
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
+    deflate() sets strm->adler to the Adler-32 checksum of all input read
+  so far (that is, total_in bytes).  If a gzip stream is being generated, then
+  strm->adler will be the CRC-32 checksum of the input read so far.  (See
+  deflateInit2 below.)
 
     deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
+  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
+  considered binary.  This field is only for information purposes and does not
+  affect the compression algorithm in any manner.
 
     deflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if all input has been
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
+  if next_in or next_out was Z_NULL or the state was inadvertently written over
+  by the application), or Z_BUF_ERROR if no progress is possible (for example
+  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
+  deflate() can be called again with more input and more output space to
+  continue compressing.
 */
 
 
@@ -369,23 +379,21 @@
 
      Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
+   the caller.  In the current version of inflate, the provided input is not
+   read or consumed.  The allocation of a sliding window will be deferred to
+   the first call of inflate (if the decompression does not complete on the
+   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
+   them to use default allocation functions.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
    version assumed by the caller, or Z_STREAM_ERROR if the parameters are
    invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
+   there is no error message.  inflateInit does not perform any decompression.
+   Actual decompression will be done by inflate().  So next_in, and avail_in,
+   next_out, and avail_out are unused and unchanged.  The current
+   implementation of inflateInit() does not process any header information --
+   that is deferred until inflate() is called.
 */
 
 
@@ -401,17 +409,20 @@
 
   - Decompress more input starting at next_in and update next_in and avail_in
     accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
+    enough room in the output buffer), then next_in and avail_in are updated
+    accordingly, and processing will resume at this point for the next call of
+    inflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  inflate() provides as much output as possible, until there is
     no more input data or no more space in the output buffer (see below about
     the flush parameter).
 
     Before the call of inflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
+  output, and updating the next_* and avail_* values accordingly.  If the
+  caller of inflate() does not provide both available input and available
+  output space, it is possible that there will be no progress made.  The
   application can consume the uncompressed output when it wants, for example
   when the output buffer is full (avail_out == 0), or after each call of
   inflate().  If inflate returns Z_OK and with zero avail_out, it must be
@@ -428,7 +439,7 @@
   gets to the end of that block, or when it runs out of data.
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
+  To assist in this, on return inflate() always sets strm->data_type to the
   number of unused bits in the last byte taken from strm->next_in, plus 64 if
   inflate() is currently decoding the last block in the deflate stream, plus
   128 if inflate() returned immediately after decoding an end-of-block code or
@@ -454,7 +465,7 @@
   this case all pending input is processed and all pending output is flushed;
   avail_out must be large enough to hold all of the uncompressed data for the
   operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  saved by the compressor for this purpose.)  The use of Z_FINISH is not
   required to perform an inflation in one step.  However it may be used to
   inform inflate that a faster approach can be used for the single inflate()
   call.  Z_FINISH also informs inflate to not maintain a sliding window if the
@@ -476,32 +487,33 @@
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
   strm->adler to the Adler-32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
+  below.  At the end of the stream, inflate() checks that its computed Adler-32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
   only if the checksum is correct.
 
     inflate() can decompress and check either zlib-wrapped or gzip-wrapped
   deflate data.  The header type is detected automatically, if requested when
   initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
+  header is not retained unless inflateGetHeader() is used.  When processing
   gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
+  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
+  uncompressed length, modulo 2^32.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
   been reached and all uncompressed output has been produced, Z_NEED_DICT if a
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
   corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  value, in which case strm->msg points to a string with a more specific
+  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  next_in or next_out was Z_NULL, or the state was inadvertently written over
+  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
+  if no progress was possible or if there was not enough room in the output
+  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
   inflate() can be called again with more input and more output space to
   continue decompressing.  If Z_DATA_ERROR is returned, the application may
   then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
+  recovery of the data is to be attempted.
 */
 
 
@@ -511,9 +523,8 @@
    This function discards any unprocessed input and does not flush any pending
    output.
 
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
+     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
+   was inconsistent.
 */
 
 
@@ -544,16 +555,29 @@
    compression at the expense of memory usage.  The default value is 15 if
    deflateInit is used instead.
 
+     For the current implementation of deflate(), a windowBits value of 8 (a
+   window size of 256 bytes) is not supported.  As a result, a request for 8
+   will result in 9 (a 512-byte window).  In that case, providing 8 to
+   inflateInit2() will result in an error when the zlib header with 9 is
+   checked against the initialization of inflate().  The remedy is to not use 8
+   with deflateInit2() with this initialization, or at least in that case use 9
+   with inflateInit2().
+
      windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
    determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
+   with no zlib header or trailer, and will not compute a check value.
 
      windowBits can also be greater than 15 for optional gzip encoding.  Add
    16 to windowBits to write a simple gzip header and trailer around the
    compressed data instead of a zlib wrapper.  The gzip header will have no
    file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+   header crc, and the operating system will be set to the appropriate value,
+   if the operating system was determined at compile time.  If a gzip stream is
+   being written, strm->adler is a CRC-32 instead of an Adler-32.
+
+     For raw deflate or gzip encoding, a request for a 256-byte window is
+   rejected as invalid, since only the zlib header provides a means of
+   transmitting the window size to the decompressor.
 
      The memLevel parameter specifies how much memory should be allocated
    for the internal compression state.  memLevel=1 uses minimum memory but is
@@ -614,12 +638,12 @@
    addition, the current implementation of deflate will use at most the window
    size minus 262 bytes of the provided dictionary.
 
-     Upon return of this function, strm->adler is set to the adler32 value
+     Upon return of this function, strm->adler is set to the Adler-32 value
    of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
+   which dictionary has been used by the compressor.  (The Adler-32 value
    applies to the whole dictionary even if only a subset of the dictionary is
    actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
+   Adler-32 value is not computed and strm->adler is not set.
 
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
@@ -628,6 +652,28 @@
    not perform any compression: this will be done by deflate().
 */
 
+ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by deflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If deflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     deflateGetDictionary() may return a length less than the window size, even
+   when more than the window size in input has been provided. It may return up
+   to 258 bytes less in that case, due to how zlib's implementation of deflate
+   manages the sliding window and lookahead for matches, where matches can be
+   up to 258 bytes long. If the application needs the last window-size bytes of
+   input, then that would need to be saved by the application outside of zlib.
+
+     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
                                     z_streamp source));
 /*
@@ -648,10 +694,10 @@
 
 ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
 /*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
+     This function is equivalent to deflateEnd followed by deflateInit, but
+   does not free and reallocate the internal compression state.  The stream
+   will leave the compression level and any other attributes that may have been
+   set unchanged.
 
      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL).
@@ -662,20 +708,35 @@
                                       int strategy));
 /*
      Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
+   interpretation of level and strategy is as in deflateInit2().  This can be
    used to switch between compression and straight copy of the input data, or
    to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
+   If the compression approach (which is a function of the level) or the
+   strategy is changed, then the input available so far is compressed with the
+   old level and strategy using deflate(strm, Z_BLOCK).  There are three
+   approaches for the compression levels 0, 1..3, and 4..9 respectively.  The
+   new level and strategy will take effect at the next call of deflate().
 
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
+     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
+   not have enough output space to complete, then the parameter change will not
+   take effect.  In this case, deflateParams() can be called again with the
+   same parameters and more output space to try again.
 
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
+     In order to assure a change in the parameters on the first try, the
+   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
+   request until strm.avail_out is not zero, before calling deflateParams().
+   Then no more input data should be provided before the deflateParams() call.
+   If this is done, the old level and strategy will be applied to the data
+   compressed before deflateParams(), and the new level and strategy will be
+   applied to the the data compressed after deflateParams().
+
+     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
+   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
+   there was not enough output space to complete the compression of the
+   available input data before a change in the strategy or approach.  Note that
+   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
+   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
+   retried with more output space.
 */
 
 ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@@ -793,7 +854,7 @@
    is for use with other formats that use the deflate compressed data format
    such as zip.  Those formats provide their own check values.  If a custom
    format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
+   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
    the uncompressed data as is done in the zlib, gzip, and zip formats.  For
    most applications, the zlib format should be used as is.  Note that comments
    above on the use in deflateInit2() applies to the magnitude of windowBits.
@@ -802,7 +863,10 @@
    32 to windowBits to enable zlib and gzip decoding with automatic header
    detection, or add 16 to decode only the gzip format (the zlib format will
    return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
+   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
+   below), inflate() will not automatically decode concatenated gzip streams.
+   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
+   would need to be reset to continue decoding a subsequent gzip stream.
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -823,7 +887,7 @@
      Initializes the decompression dictionary from the given uncompressed byte
    sequence.  This function must be called immediately after a call of inflate,
    if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
+   can be determined from the Adler-32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
    deflateSetDictionary).  For raw inflate, this function can be called at any
    time to set the dictionary.  If the provided dictionary is smaller than the
@@ -834,7 +898,7 @@
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
@@ -892,7 +956,7 @@
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
+   but does not free and reallocate the internal decompression state.  The
    stream will keep attributes that may have been set by inflateInit2.
 
      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
@@ -904,7 +968,9 @@
 /*
      This function is the same as inflateReset, but it also permits changing
    the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
+   the same as it is for inflateInit2.  If the window size is changed, then the
+   memory allocated for the window is freed, and the window will be reallocated
+   by inflate() if needed.
 
      inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL), or if
@@ -956,7 +1022,7 @@
    location in the input stream can be determined from avail_in and data_type
    as noted in the description for the Z_BLOCK flush parameter for inflate.
 
-     inflateMark returns the value noted above or -1 << 16 if the provided
+     inflateMark returns the value noted above, or -65536 if the provided
    source stream state was inconsistent.
 */
 
@@ -1048,9 +1114,9 @@
    This routine would normally be used in a utility that reads zip or gzip
    files and writes out uncompressed files.  The utility would decode the
    header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
+   the raw deflate stream to decompress.  This is different from the default
+   behavior of inflate(), which expects a zlib header and trailer around the
+   deflate stream.
 
      inflateBack() uses two subroutines supplied by the caller that are then
    called by inflateBack() for input and output.  inflateBack() calls those
@@ -1059,12 +1125,12 @@
    parameters and return types are defined above in the in_func and out_func
    typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
    number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
+   there is no input available, in() must return zero -- buf is ignored in that
+   case -- and inflateBack() will return a buffer error.  inflateBack() will
+   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
+   out() should return zero on success, or non-zero on failure.  If out()
+   returns non-zero, inflateBack() will return with an error.  Neither in() nor
+   out() are permitted to change the contents of the window provided to
    inflateBackInit(), which is also the buffer that out() uses to write from.
    The length written by out() will be at most the window size.  Any non-zero
    amount of input may be provided by in().
@@ -1092,7 +1158,7 @@
    using strm->next_in which will be Z_NULL only if in() returned an error.  If
    strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
    non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
+   assured to be defined if out() returns non-zero.)  Note that inflateBack()
    cannot return Z_OK.
 */
 
@@ -1114,7 +1180,7 @@
      7.6: size of z_off_t
 
     Compiler, assembler, and debug options:
-     8: DEBUG
+     8: ZLIB_DEBUG
      9: ASMV or ASMINF -- use ASM code
      10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
      11: 0 (reserved)
@@ -1164,7 +1230,8 @@
    the byte length of the source buffer.  Upon entry, destLen is the total size
    of the destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.  compress() is equivalent to compress2() with a level
+   parameter of Z_DEFAULT_COMPRESSION.
 
      compress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1180,7 +1247,7 @@
    length of the source buffer.  Upon entry, destLen is the total size of the
    destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
@@ -1203,7 +1270,7 @@
    uncompressed data.  (The size of the uncompressed data must have been saved
    previously by the compressor and transmitted to the decompressor by some
    mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
+   is the actual size of the uncompressed data.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1212,6 +1279,14 @@
    buffer with the uncompressed data up to that point.
 */
 
+ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
+                                    const Bytef *source, uLong *sourceLen));
+/*
+     Same as uncompress, except that sourceLen is a pointer, where the
+   length of the source is *sourceLen.  On return, *sourceLen is the number of
+   source bytes consumed.
+*/
+
                         /* gzip file access functions */
 
 /*
@@ -1290,10 +1365,9 @@
    default buffer size is 8192 bytes.  This function must be called after
    gzopen() or gzdopen(), and before any other calls that read or write the
    file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
+   write.  Three times that size in buffer space is allocated.  A larger buffer
+   size of, for example, 64K or 128K bytes will noticeably increase the speed
+   of decompression (reading).
 
      The new buffer size also affects the maximum length for gzprintf().
 
@@ -1304,10 +1378,12 @@
 ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
      Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
+   of deflateInit2 for the meaning of these parameters.  Previously provided
+   data is flushed before the parameter change.
 
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
+     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
+   opened for writing, Z_ERRNO if there is an error writing the flushed data,
+   or Z_MEM_ERROR if there is a memory allocation error.
 */
 
 ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
@@ -1335,7 +1411,35 @@
    case.
 
      gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
+   len for end of file, or -1 for error.  If len is too large to fit in an int,
+   then nothing is read, -1 is returned, and the error state is set to
+   Z_STREAM_ERROR.
+*/
+
+ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
+                                     gzFile file));
+/*
+     Read up to nitems items of size size from file to buf, otherwise operating
+   as gzread() does.  This duplicates the interface of stdio's fread(), with
+   size_t request and return types.  If the library defines size_t, then
+   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
+   integer type that can contain a pointer.
+
+     gzfread() returns the number of full items read of size size, or zero if
+   the end of the file was reached and a full item could not be read, or if
+   there was an error.  gzerror() must be consulted if zero is returned in
+   order to determine if there was an error.  If the multiplication of size and
+   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
+   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
+
+     In the event that the end of file is reached and only a partial item is
+   available at the end, i.e. the remaining uncompressed data length is not a
+   multiple of size, then the final partial item is nevetheless read into buf
+   and the end-of-file flag is set.  The length of the partial item read is not
+   provided, but could be inferred from the result of gztell().  This behavior
+   is the same as the behavior of fread() implementations in common libraries,
+   but it prevents the direct use of gzfread() to read a concurrently written
+   file, reseting and retrying on end-of-file, when size is not 1.
 */
 
 ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
@@ -1346,19 +1450,33 @@
    error.
 */
 
+ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
+                                      z_size_t nitems, gzFile file));
+/*
+     gzfwrite() writes nitems items of size size from buf to file, duplicating
+   the interface of stdio's fwrite(), with size_t request and return types.  If
+   the library defines size_t, then z_size_t is identical to size_t.  If not,
+   then z_size_t is an unsigned integer type that can contain a pointer.
+
+     gzfwrite() returns the number of full items written of size size, or zero
+   if there was an error.  If the multiplication of size and nitems overflows,
+   i.e. the product does not fit in a z_size_t, then nothing is written, zero
+   is returned, and the error state is set to Z_STREAM_ERROR.
+*/
+
 ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
 /*
      Converts, formats, and writes the arguments to the compressed file under
    control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
+   uncompressed bytes actually written, or a negative zlib error code in case
+   of error.  The number of uncompressed bytes written is limited to 8191, or
+   one less than the buffer size given to gzbuffer().  The caller should assure
+   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
+   return an error (0) with nothing written.  In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   because the secure snprintf() or vsnprintf() functions were not available.
+   This can be determined using zlibCompileFlags().
 */
 
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
@@ -1418,7 +1536,7 @@
      If the flush parameter is Z_FINISH, the remaining data is written and the
    gzip stream is completed in the output.  If gzwrite() is called again, a new
    gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
+   concatenated gzip streams.
 
      gzflush should be called only when strictly necessary because it will
    degrade compression if called too often.
@@ -1572,7 +1690,7 @@
    return the updated checksum.  If buf is Z_NULL, this function returns the
    required initial value for the checksum.
 
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
    much faster.
 
    Usage example:
@@ -1585,6 +1703,12 @@
      if (adler != original_adler) error();
 */
 
+ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
+                                    z_size_t len));
+/*
+     Same as adler32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
                                           z_off_t len2));
@@ -1614,6 +1738,12 @@
      if (crc != original_crc) error();
 */
 
+ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
+                                  z_size_t len));
+/*
+     Same as crc32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 
@@ -1644,19 +1774,35 @@
                                          unsigned char FAR *window,
                                          const char *version,
                                          int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
+#ifdef Z_PREFIX_SET
+#  define z_deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define z_inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#else
+#  define deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#endif
 
 #ifndef Z_SOLO
 
@@ -1676,10 +1822,10 @@
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #else
 #  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
@@ -1737,19 +1883,16 @@
 
 #endif /* !Z_SOLO */
 
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
 /* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
 ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                             const char *mode));
 #endif
diff --git a/darwin-x86_64/lib/gettext/hostname b/darwin-x86_64/lib/gettext/hostname
index 372b38f..fd775b4 100755
--- a/darwin-x86_64/lib/gettext/hostname
+++ b/darwin-x86_64/lib/gettext/hostname
Binary files differ
diff --git a/darwin-x86_64/lib/gettext/urlget b/darwin-x86_64/lib/gettext/urlget
index 459d056..e405ca7 100755
--- a/darwin-x86_64/lib/gettext/urlget
+++ b/darwin-x86_64/lib/gettext/urlget
Binary files differ
diff --git a/darwin-x86_64/lib/libSDL2.a b/darwin-x86_64/lib/libSDL2.a
index 1004210..4781175 100644
--- a/darwin-x86_64/lib/libSDL2.a
+++ b/darwin-x86_64/lib/libSDL2.a
Binary files differ
diff --git a/darwin-x86_64/lib/libSDL2_test.a b/darwin-x86_64/lib/libSDL2_test.a
index 0d4ae92..ab382f6 100644
--- a/darwin-x86_64/lib/libSDL2_test.a
+++ b/darwin-x86_64/lib/libSDL2_test.a
Binary files differ
diff --git a/darwin-x86_64/lib/libSDL2main.a b/darwin-x86_64/lib/libSDL2main.a
index 0f221e6..63192b8 100644
--- a/darwin-x86_64/lib/libSDL2main.a
+++ b/darwin-x86_64/lib/libSDL2main.a
Binary files differ
diff --git a/darwin-x86_64/lib/libasprintf.a b/darwin-x86_64/lib/libasprintf.a
index c4f8cda..54976d3 100644
--- a/darwin-x86_64/lib/libasprintf.a
+++ b/darwin-x86_64/lib/libasprintf.a
Binary files differ
diff --git a/darwin-x86_64/lib/libcharset.a b/darwin-x86_64/lib/libcharset.a
index 14e5c77..ddeae29 100644
--- a/darwin-x86_64/lib/libcharset.a
+++ b/darwin-x86_64/lib/libcharset.a
Binary files differ
diff --git a/darwin-x86_64/lib/libfdt.a b/darwin-x86_64/lib/libfdt.a
index 29820f8..1ea07af 100644
--- a/darwin-x86_64/lib/libfdt.a
+++ b/darwin-x86_64/lib/libfdt.a
Binary files differ
diff --git a/darwin-x86_64/lib/libffi.a b/darwin-x86_64/lib/libffi.a
index 2356387..2e90eb2 100644
--- a/darwin-x86_64/lib/libffi.a
+++ b/darwin-x86_64/lib/libffi.a
Binary files differ
diff --git a/darwin-x86_64/lib/libgettextlib.a b/darwin-x86_64/lib/libgettextlib.a
index c593dab..076e10d 100644
--- a/darwin-x86_64/lib/libgettextlib.a
+++ b/darwin-x86_64/lib/libgettextlib.a
Binary files differ
diff --git a/darwin-x86_64/lib/libgettextpo.a b/darwin-x86_64/lib/libgettextpo.a
index 71b91b3..09eb31c 100644
--- a/darwin-x86_64/lib/libgettextpo.a
+++ b/darwin-x86_64/lib/libgettextpo.a
Binary files differ
diff --git a/darwin-x86_64/lib/libgettextsrc.a b/darwin-x86_64/lib/libgettextsrc.a
index b150ad4..65b8542 100644
--- a/darwin-x86_64/lib/libgettextsrc.a
+++ b/darwin-x86_64/lib/libgettextsrc.a
Binary files differ
diff --git a/darwin-x86_64/lib/libgio-2.0.a b/darwin-x86_64/lib/libgio-2.0.a
index c44af22..d341627 100644
--- a/darwin-x86_64/lib/libgio-2.0.a
+++ b/darwin-x86_64/lib/libgio-2.0.a
Binary files differ
diff --git a/darwin-x86_64/lib/libglib-2.0.a b/darwin-x86_64/lib/libglib-2.0.a
index da97737..bf024a1 100644
--- a/darwin-x86_64/lib/libglib-2.0.a
+++ b/darwin-x86_64/lib/libglib-2.0.a
Binary files differ
diff --git a/darwin-x86_64/lib/libgmodule-2.0.a b/darwin-x86_64/lib/libgmodule-2.0.a
index a6e3b75..e04f515 100644
--- a/darwin-x86_64/lib/libgmodule-2.0.a
+++ b/darwin-x86_64/lib/libgmodule-2.0.a
Binary files differ
diff --git a/darwin-x86_64/lib/libgobject-2.0.a b/darwin-x86_64/lib/libgobject-2.0.a
index 432280c..aed3d95 100644
--- a/darwin-x86_64/lib/libgobject-2.0.a
+++ b/darwin-x86_64/lib/libgobject-2.0.a
Binary files differ
diff --git a/darwin-x86_64/lib/libgthread-2.0.a b/darwin-x86_64/lib/libgthread-2.0.a
index abedfd1..e7db688 100644
--- a/darwin-x86_64/lib/libgthread-2.0.a
+++ b/darwin-x86_64/lib/libgthread-2.0.a
Binary files differ
diff --git a/darwin-x86_64/lib/libiconv.a b/darwin-x86_64/lib/libiconv.a
index 37b53d9..0a1f5e5 100644
--- a/darwin-x86_64/lib/libiconv.a
+++ b/darwin-x86_64/lib/libiconv.a
Binary files differ
diff --git a/darwin-x86_64/lib/libintl.a b/darwin-x86_64/lib/libintl.a
index 1bbe9a9..eeb4524 100644
--- a/darwin-x86_64/lib/libintl.a
+++ b/darwin-x86_64/lib/libintl.a
Binary files differ
diff --git a/darwin-x86_64/lib/libpixman-1.a b/darwin-x86_64/lib/libpixman-1.a
index 84527dc..95f275e 100644
--- a/darwin-x86_64/lib/libpixman-1.a
+++ b/darwin-x86_64/lib/libpixman-1.a
Binary files differ
diff --git a/darwin-x86_64/lib/libpng16.a b/darwin-x86_64/lib/libpng16.a
index fb7fc74..717c042 100644
--- a/darwin-x86_64/lib/libpng16.a
+++ b/darwin-x86_64/lib/libpng16.a
Binary files differ
diff --git a/darwin-x86_64/lib/libz.1.2.10.dylib b/darwin-x86_64/lib/libz.1.2.10.dylib
new file mode 100755
index 0000000..2c55ef3
--- /dev/null
+++ b/darwin-x86_64/lib/libz.1.2.10.dylib
Binary files differ
diff --git a/darwin-x86_64/lib/libz.1.2.8.dylib b/darwin-x86_64/lib/libz.1.2.8.dylib
deleted file mode 100755
index 9387647..0000000
--- a/darwin-x86_64/lib/libz.1.2.8.dylib
+++ /dev/null
Binary files differ
diff --git a/darwin-x86_64/lib/libz.1.dylib b/darwin-x86_64/lib/libz.1.dylib
index 3871806..b630d25 120000
--- a/darwin-x86_64/lib/libz.1.dylib
+++ b/darwin-x86_64/lib/libz.1.dylib
@@ -1 +1 @@
-libz.1.2.8.dylib
\ No newline at end of file
+libz.1.2.10.dylib
\ No newline at end of file
diff --git a/darwin-x86_64/lib/libz.a b/darwin-x86_64/lib/libz.a
index 23f49af..385d8a9 100644
--- a/darwin-x86_64/lib/libz.a
+++ b/darwin-x86_64/lib/libz.a
Binary files differ
diff --git a/darwin-x86_64/lib/libz.dylib b/darwin-x86_64/lib/libz.dylib
index 3871806..b630d25 120000
--- a/darwin-x86_64/lib/libz.dylib
+++ b/darwin-x86_64/lib/libz.dylib
@@ -1 +1 @@
-libz.1.2.8.dylib
\ No newline at end of file
+libz.1.2.10.dylib
\ No newline at end of file
diff --git a/darwin-x86_64/lib/pkgconfig/zlib.pc b/darwin-x86_64/lib/pkgconfig/zlib.pc
index d02d6ef..2eae046 100644
--- a/darwin-x86_64/lib/pkgconfig/zlib.pc
+++ b/darwin-x86_64/lib/pkgconfig/zlib.pc
@@ -6,7 +6,7 @@
 
 Name: zlib
 Description: zlib compression library
-Version: 1.2.8
+Version: 1.2.10
 
 Requires:
 Libs: -L${libdir} -L${sharedlibdir} -lz
diff --git a/linux-x86/bin/gdbus b/linux-x86/bin/gdbus
deleted file mode 100755
index 233b503..0000000
--- a/linux-x86/bin/gdbus
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/gdbus-codegen b/linux-x86/bin/gdbus-codegen
deleted file mode 100755
index 4073a4c..0000000
--- a/linux-x86/bin/gdbus-codegen
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python
-
-# GDBus - GLib D-Bus Library
-#
-# Copyright (C) 2008-2011 Red Hat, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General
-# Public License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# Author: David Zeuthen <davidz@redhat.com>
-
-
-import os
-import sys
-
-srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
-
-if srcdir is not None:
-    path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
-elif os.name == 'nt':
-    # Makes gdbus-codegen 'relocatable' at runtime on Windows.
-    path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
-else:
-    path = os.path.join('/tmp/digit-build-temp-464/install-linux-x86/share', 'glib-2.0')
-
-sys.path.insert(0, os.path.abspath(path))
-from codegen import codegen_main
-
-sys.exit(codegen_main.codegen_main())
diff --git a/linux-x86/bin/gio-querymodules b/linux-x86/bin/gio-querymodules
deleted file mode 100755
index 27300ba..0000000
--- a/linux-x86/bin/gio-querymodules
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/glib-compile-resources b/linux-x86/bin/glib-compile-resources
deleted file mode 100755
index b7c1a29..0000000
--- a/linux-x86/bin/glib-compile-resources
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/glib-compile-schemas b/linux-x86/bin/glib-compile-schemas
deleted file mode 100755
index 237a4bd..0000000
--- a/linux-x86/bin/glib-compile-schemas
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/glib-genmarshal b/linux-x86/bin/glib-genmarshal
deleted file mode 100755
index ccbe700..0000000
--- a/linux-x86/bin/glib-genmarshal
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/glib-gettextize b/linux-x86/bin/glib-gettextize
deleted file mode 100755
index 3a8e968..0000000
--- a/linux-x86/bin/glib-gettextize
+++ /dev/null
@@ -1,188 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-
-# - Modified in October 2001 by jacob berkman <jacob@ximian.com> to
-# work with glib's Makefile.in.in and po2tbl.sed.in, to not copy in
-# intl/, and to not add ChangeLog entries to po/ChangeLog
-
-# This file is meant for authors or maintainers which want to
-# internationalize their package with the help of GNU gettext.  For
-# further information how to use it consult the GNU gettext manual.
-
-echo=echo
-progname=$0
-force=0
-configstatus=0
-origdir=`pwd`
-usage="\
-Usage: glib-gettextize [OPTION]... [package-dir]
-      --help           print this help and exit
-      --version        print version information and exit
-  -c, --copy           copy files instead of making symlinks
-  -f, --force          force writing of new files even if old exist
-Report bugs to http://bugzilla.gnome.org/."
-package=glib
-version=2.38.2
-try_ln_s=:
-
-# Directory where the sources are stored.
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-case `uname` in
-MINGW32*)
-    prefix="`dirname $0`/.."
-    ;;
-esac
-
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-
-gettext_dir=$prefix/share/glib-2.0/gettext
-
-while test $# -gt 0; do
-  case "$1" in
-    -c | --copy | --c* )
-      shift
-      try_ln_s=false ;;
-    -f | --force | --f* )
-      shift
-      force=1 ;;
-    -r | --run | --r* )
-      shift
-      configstatus=1 ;;
-    --help | --h* )
-      $echo "$usage"; exit 0 ;;
-    --version | --v* )
-      echo "$progname (GNU $package) $version"
-      $echo "Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-      $echo "Written by" "Ulrich Drepper"
-      exit 0 ;;
-    -- )	# Stop option prcessing
-      shift; break ;;
-    -* )
-      $echo "glib-gettextize: unknown option $1"
-      $echo "Try \`glib-gettextize --help' for more information."; exit 1 ;;
-    * )
-      break ;;
-  esac
-done
-
-if test $# -gt 1; then
-  $echo "$usage"
-  exit 1
-fi
-
-# Fill in the command line options value.
-if test $# -eq 1; then
-  srcdir=$1
-  if cd "$srcdir"; then
-    srcdir=`pwd`
-  else
-    $echo "Cannot change directory to \`$srcdir'"
-    exit 1
-  fi
-else
-  srcdir=$origdir
-fi
-
-test -f configure.in || test -f configure.ac || {
-  $echo "Missing configure.in or configure.ac, please cd to your package first."
-  exit 1
-}
-
-configure_in=NONE
-if test -f configure.in; then
-  configure_in=configure.in
-else
-  if test -f configure.ac; then
-    configure_in=configure.ac
-  fi
-fi
-# Check in which directory config.rpath, mkinstalldirs etc. belong.
-auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-if test -n "$auxdir"; then
-  auxdir="$auxdir/"
-fi
-
-if test -f po/Makefile.in.in && test $force -eq 0; then
-  $echo "\
-po/Makefile.in.in exists: use option -f if you really want to delete it."
-  exit 1
-fi
-
-test -d po || {
-  $echo "Creating po/ subdirectory"
-  mkdir po || {
-    $echo "failed to create po/ subdirectory"
-    exit 1
-  }
-}
-
-# For simplicity we changed to the gettext source directory.
-cd $gettext_dir || {
-   $echo "gettext source directory '${gettext_dir}' doesn't exist"
-   exit 1
-}
-
-# Now copy all files.  Take care for the destination directories.
-for file in *; do
-  case $file in
-    intl | po)
-      ;;
-    mkinstalldirs)
-      rm -f "$srcdir/$auxdir$file"
-      ($try_ln_s && ln -s $gettext_dir/$file "$srcdir/$auxdir$file" && $echo "Symlinking file $file") 2>/dev/null ||
-      { $echo "Copying file $file"; cp $file "$srcdir/$auxdir$file"; }
-      ;;
-    *)
-      rm -f "$srcdir/$file"
-      ($try_ln_s && ln -s $gettext_dir/$file "$srcdir/$file" && $echo "Symlinking file $file") 2>/dev/null ||
-      { $echo "Copying file $file"; cp $file "$srcdir/$file"; }
-      ;;
-  esac
-done
-
-# Copy files to po/ subdirectory.
-cd po
-for file in *; do
-  rm -f "$srcdir/po/$file"
-  ($try_ln_s && ln -s $gettext_dir/po/$file "$srcdir/po/$file" && $echo "Symlinking file po/$file") 2>/dev/null ||
-  { $echo "Copying file po/$file"; cp $file "$srcdir/po/$file"; }
-done
-if test -f "$srcdir/po/cat-id-tbl.c"; then
-  $echo "Removing po/cat-id-tbl.c"
-  rm -f "$srcdir/po/cat-id-tbl.c"
-fi
-if test -f "$srcdir/po/stamp-cat-id"; then
-  $echo "Removing po/stamp-cat-id"
-  rm -f "$srcdir/po/stamp-cat-id"
-fi
-
-echo
-echo "Please add the files"
-echo "  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4"
-echo "  progtest.m4"
-echo "from the $datadir/aclocal directory to your autoconf macro directory"
-echo "or directly to your aclocal.m4 file."
-echo "You will also need config.guess and config.sub, which you can get from"
-echo "ftp://ftp.gnu.org/pub/gnu/config/."
-echo
-
-exit 0
diff --git a/linux-x86/bin/glib-mkenums b/linux-x86/bin/glib-mkenums
deleted file mode 100755
index da99026..0000000
--- a/linux-x86/bin/glib-mkenums
+++ /dev/null
@@ -1,565 +0,0 @@
-#! /usr/bin/perl
-
-use warnings;
-use File::Basename;
-use Safe;
-
-# glib-mkenums.pl 
-# Information about the current enumeration
-my $flags;			# Is enumeration a bitmask?
-my $option_underscore_name;	# Overriden underscore variant of the enum name
-				# for example to fix the cases we don't get the
-				# mixed-case -> underscorized transform right.
-my $option_lowercase_name;	# DEPRECATED.  A lower case name to use as part
-				# of the *_get_type() function, instead of the
-				# one that we guess. For instance, when an enum
-				# uses abnormal capitalization and we can not
-				# guess where to put the underscores.
-my $seenbitshift;		# Have we seen bitshift operators?
-my $enum_prefix;		# Prefix for this enumeration
-my $enumname;			# Name for this enumeration
-my $enumshort;			# $enumname without prefix
-my $enumname_prefix;		# prefix of $enumname
-my $enumindex = 0;		# Global enum counter
-my $firstenum = 1;		# Is this the first enumeration per file?
-my @entries;			# [ $name, $val ] for each entry
-my $sandbox = Safe->new;        # sandbox for safe evaluation of expressions
-
-sub parse_trigraph {
-    my $opts = shift;
-    my @opts;
-
-    for $opt (split /\s*,\s*/, $opts) {
-	$opt =~ s/^\s*//;
-	$opt =~ s/\s*$//;
-        my ($key,$val) = $opt =~ /(\w+)(?:=(.+))?/;
-	defined $val or $val = 1;
-	push @opts, $key, $val;
-    }
-    @opts;
-}
-sub parse_entries {
-    my $file = shift;
-    my $file_name = shift;
-    my $looking_for_name = 0;
-    
-    while (<$file>) {
-	# read lines until we have no open comments
-	while (m@/\*([^*]|\*(?!/))*$@) {
-	    my $new;
-	    defined ($new = <$file>) || die "Unmatched comment in $ARGV";
-	    $_ .= $new;
-	}
-	# strip comments w/o options
-	s@/\*(?!<)
-	    ([^*]+|\*(?!/))*
-	   \*/@@gx;
-	
-	# strip newlines
-	s@\n@ @;
-	
-	# skip empty lines
-	next if m@^\s*$@;
-	
-	if ($looking_for_name) {
-	    if (/^\s*(\w+)/) {
-		$enumname = $1;
-		return 1;
-	    }
-	}
-	
-	# Handle include files
-	if (/^\#include\s*<([^>]*)>/ ) {
-            my $file= "../$1";
-	    open NEWFILE, $file or die "Cannot open include file $file: $!\n";
-	    
-	    if (parse_entries (\*NEWFILE, $NEWFILE)) {
-		return 1;
-	    } else {
-		next;
-	    }
-	}
-	
-	if (/^\s*\}\s*(\w+)/) {
-	    $enumname = $1;
-	    $enumindex++;
-	    return 1;
-	}
-	
-	if (/^\s*\}/) {
-	    $enumindex++;
-	    $looking_for_name = 1;
-	    next;
-	}
-
-        if (m@^\s*
-              (\w+)\s*                   # name
-              (?:=(                      # value
-		   \s*\w+\s*\(.*\)\s*       # macro with multiple args
-		   |                        # OR
-                   (?:[^,/]|/(?!\*))*       # anything but a comma or comment
-                  ))?,?\s*
-              (?:/\*<                    # options
-                (([^*]|\*(?!/))*)
-               >\s*\*/)?,?
-              \s*$
-             @x) {
-            my ($name, $value, $options) = ($1,$2,$3);
-
-	    if (!defined $flags && defined $value && $value =~ /<</) {
-		$seenbitshift = 1;
-	    }
-
-	    if (defined $options) {
-		my %options = parse_trigraph($options);
-		if (!defined $options{skip}) {
-		    push @entries, [ $name, $value, $options{nick} ];
-		}
-	    } else {
-		push @entries, [ $name, $value ];
-	    }
-	} elsif (m@^\s*\#@) {
-	    # ignore preprocessor directives
-	} else {
-	    print STDERR "$0: $file_name:$.: Failed to parse `$_'\n";
-	}
-    }
-
-    return 0;
-}
-
-sub version {
-    print "glib-mkenums version glib-2.38.2\n";
-    print "glib-mkenums comes with ABSOLUTELY NO WARRANTY.\n";
-    print "You may redistribute copies of glib-mkenums under the terms of\n";
-    print "the GNU General Public License which can be found in the\n";
-    print "GLib source package. Sources, examples and contact\n";
-    print "information are available at http://www.gtk.org\n";
-    exit 0;
-}
-sub usage {
-    print "Usage:\n";
-    print "  glib-mkenums [OPTION...] [FILES...]\n\n";
-    print "Help Options:\n";
-    print "  -h, --help            Show this help message\n\n";
-    print "Utility Options:\n";
-    print "  --identifier-prefix <text>   Identifier prefix\n";
-    print "  --symbol-prefix <text>       Symbol prefix\n";
-    print "  --fhead <text>               Output file header\n";
-    print "  --fprod <text>               Per input file production\n";
-    print "  --ftail <text>               Output file trailer\n";
-    print "  --eprod <text>               Per enum text (produced prior to value itarations)\n";
-    print "  --vhead <text>               Value header, produced before iterating over enum values\n";
-    print "  --vprod <text>               Value text, produced for each enum value\n";
-    print "  --vtail <text>               Value tail, produced after iterating over enum values\n";
-    print "  --comments <text>            Comment structure\n";
-    print "  --template file              Template file\n";
-    print "  -v, --version                Print version informations\n\n";
-    print "Production text substitutions:\n";
-    print "  \@EnumName\@            PrefixTheXEnum\n";
-    print "  \@enum_name\@           prefix_the_xenum\n";
-    print "  \@ENUMNAME\@            PREFIX_THE_XENUM\n";
-    print "  \@ENUMSHORT\@           THE_XENUM\n";
-    print "  \@ENUMPREFIX\@          PREFIX\n";
-    print "  \@VALUENAME\@           PREFIX_THE_XVALUE\n";
-    print "  \@valuenick\@           the-xvalue\n";
-    print "  \@valuenum\@            the integer value (limited support, Since: 2.26)\n";
-    print "  \@type\@                either enum or flags\n";
-    print "  \@Type\@                either Enum or Flags\n";
-    print "  \@TYPE\@                either ENUM or FLAGS\n";
-    print "  \@filename\@            name of current input file\n";
-    print "  \@basename\@            base name of the current input file (Since: 2.22)\n";
-    exit 0;
-}
-
-# production variables:
-my $idprefix = "";    # "G", "Gtk", etc
-my $symprefix = "";   # "g", "gtk", etc, if not just lc($idprefix)
-my $fhead = "";   # output file header
-my $fprod = "";   # per input file production
-my $ftail = "";   # output file trailer
-my $eprod = "";   # per enum text (produced prior to value itarations)
-my $vhead = "";   # value header, produced before iterating over enum values
-my $vprod = "";   # value text, produced for each enum value
-my $vtail = "";   # value tail, produced after iterating over enum values
-my $comment_tmpl = "";   # comment template
-
-sub read_template_file {
-  my ($file) = @_;
-  my %tmpl = ('file-header', $fhead, 
-	      'file-production', $fprod, 
-	      'file-tail', $ftail, 
-	      'enumeration-production', $eprod,
-	      'value-header', $vhead,
-	      'value-production', $vprod,
-	      'value-tail', $vtail,
-	      'comment', $comment_tmpl);
-  my $in = 'junk';
-  open (FILE, $file) || die "Can't open $file: $!\n";
-  while (<FILE>) {
-    if (/^\/\*\*\*\s+(BEGIN|END)\s+([\w-]+)\s+\*\*\*\//) {
-      if (($in eq 'junk') && ($1 eq 'BEGIN') && (exists($tmpl{$2}))) {
-	$in = $2;
-	next;
-      }
-      elsif (($in eq $2) && ($1 eq 'END') && (exists($tmpl{$2}))) {
-	$in = 'junk';
-	next;
-      } else {
-	  die "Malformed template file $file\n";
-      }
-    }
-    if (!($in eq 'junk')) {
-	$tmpl{$in} .= $_;
-    }
-  }
-  close (FILE);
-  if (!($in eq 'junk')) {
-      die "Malformed template file $file\n";
-  }
-  $fhead = $tmpl{'file-header'};
-  $fprod = $tmpl{'file-production'};
-  $ftail = $tmpl{'file-tail'};
-  $eprod = $tmpl{'enumeration-production'};
-  $vhead = $tmpl{'value-header'};
-  $vprod = $tmpl{'value-production'};
-  $vtail = $tmpl{'value-tail'};
-  $comment_tmpl = $tmpl{'comment'};
-
-  # default to C-style comments
-  $comment_tmpl = "/* \@comment\@ */" if $comment_tmpl eq "";
-}
-
-if (!defined $ARGV[0]) {
-    usage;
-}
-while ($_=$ARGV[0],/^-/) {
-    shift;
-    last if /^--$/;
-    if (/^--template$/)                      { read_template_file (shift); }
-    elsif (/^--identifier-prefix$/)          { $idprefix = shift }
-    elsif (/^--symbol-prefix$/)              { $symprefix = shift }
-    elsif (/^--fhead$/)                      { $fhead = $fhead . shift }
-    elsif (/^--fprod$/)                      { $fprod = $fprod . shift }
-    elsif (/^--ftail$/)                      { $ftail = $ftail . shift }
-    elsif (/^--eprod$/)                      { $eprod = $eprod . shift }
-    elsif (/^--vhead$/)                      { $vhead = $vhead . shift }
-    elsif (/^--vprod$/)                      { $vprod = $vprod . shift }
-    elsif (/^--vtail$/)                      { $vtail = $vtail . shift }
-    elsif (/^--comments$/)                   { $comment_tmpl = shift }
-    elsif (/^--help$/ || /^-h$/ || /^-\?$/)  { usage; }
-    elsif (/^--version$/ || /^-v$/)          { version; }
-    else { usage; }
-    last if not defined($ARGV[0]);
-}
-
-# put auto-generation comment
-{
-    my $comment = $comment_tmpl;
-    $comment =~ s/\@comment\@/Generated data (by glib-mkenums)/;
-    print "\n" . $comment . "\n\n";
-}
-
-if (length($fhead)) {
-    my $prod = $fhead;
-    my $base = basename ($ARGV[0]);
-
-    $prod =~ s/\@filename\@/$ARGV[0]/g;
-    $prod =~ s/\@basename\@/$base/g;
-    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-    chomp ($prod);
-		
-    print "$prod\n";
-}
-
-while (<>) {
-    if (eof) {
-	close (ARGV);		# reset line numbering
-	$firstenum = 1;		# Flag to print filename at next enum
-    }
-
-    # read lines until we have no open comments
-    while (m@/\*([^*]|\*(?!/))*$@) {
-	my $new;
-	defined ($new = <>) || die "Unmatched comment in $ARGV";
-	$_ .= $new;
-    }
-    # strip comments w/o options
-    s@/\*(?!<)
-       ([^*]+|\*(?!/))*
-       \*/@@gx;
-	
-    # ignore forward declarations
-    next if /^\s*typedef\s+enum.*;/;
-
-    if (m@^\s*typedef\s+enum\s*
-           ({)?\s*
-           (?:/\*<
-             (([^*]|\*(?!/))*)
-            >\s*\*/)?
-           \s*({)?
-         @x) {
-	if (defined $2) {
-	    my %options = parse_trigraph ($2);
-	    next if defined $options{skip};
-	    $enum_prefix = $options{prefix};
-	    $flags = $options{flags};
-	    $option_lowercase_name = $options{lowercase_name};
-	    $option_underscore_name = $options{underscore_name};
-	} else {
-	    $enum_prefix = undef;
-	    $flags = undef;
-	    $option_lowercase_name = undef;
-	    $option_underscore_name = undef;
-	}
-	if (defined $option_lowercase_name) {
-	    if (defined $option_underscore_name) {
-		print STDERR "$0: $ARGV:$.: lowercase_name overriden with underscore_name\n";
-		$option_lowercase_name = undef;
-	    } else {
-		print STDERR "$0: $ARGV:$.: lowercase_name is deprecated, use underscore_name\n";
-	    }
-	}
-	# Didn't have trailing '{' look on next lines
-	if (!defined $1 && !defined $4) {
-	    while (<>) {
-		if (eof) {
-		    die "Hit end of file while parsing enum in $ARGV";
-		}
-		if (s/^\s*\{//) {
-		    last;
-		}
-	    }
-	}
-
-	$seenbitshift = 0;
-	@entries = ();
-
-	# Now parse the entries
-	parse_entries (\*ARGV, $ARGV);
-
-	# figure out if this was a flags or enums enumeration
-	if (!defined $flags) {
-	    $flags = $seenbitshift;
-	}
-
-	# Autogenerate a prefix
-	if (!defined $enum_prefix) {
-	    for (@entries) {
-		my $nick = $_->[2];
-		if (!defined $nick) {
-		    my $name = $_->[0];
-		    if (defined $enum_prefix) {
-			my $tmp = ~ ($name ^ $enum_prefix);
-			($tmp) = $tmp =~ /(^\xff*)/;
-			$enum_prefix = $enum_prefix & $tmp;
-		    } else {
-			$enum_prefix = $name;
-		    }
-		}
-	    }
-	    if (!defined $enum_prefix) {
-		$enum_prefix = "";
-	    } else {
-		# Trim so that it ends in an underscore
-		$enum_prefix =~ s/_[^_]*$/_/;
-	    }
-	} else {
-	    # canonicalize user defined prefixes
-	    $enum_prefix = uc($enum_prefix);
-	    $enum_prefix =~ s/-/_/g;
-	    $enum_prefix =~ s/(.*)([^_])$/$1$2_/;
-	}
-	
-	for $entry (@entries) {
-	    my ($name,$num,$nick) = @{$entry};
-            if (!defined $nick) {
- 	        ($nick = $name) =~ s/^$enum_prefix//;
-	        $nick =~ tr/_/-/;
-	        $nick = lc($nick);
-	        @{$entry} = ($name, $num, $nick);
-            }
-	}
-	
-
-	# Spit out the output
-	if (defined $option_underscore_name) {
-	    $enumlong = uc $option_underscore_name;
-	    $enumsym = lc $option_underscore_name;
-	    $enumshort = $enumlong;
-	    $enumshort =~ s/^[A-Z][A-Z0-9]*_//;
-
-	    $enumname_prefix = $enumlong;
-	    $enumname_prefix =~ s/_$enumshort$//;
-	} elsif (!$symprefix && !$idprefix) {
-	    # enumname is e.g. GMatchType
-	    $enspace = $enumname;
-	    $enspace =~ s/^([A-Z][a-z]*).*$/$1/;
-
-	    $enumshort = $enumname;
-	    $enumshort =~ s/^[A-Z][a-z]*//;
-	    $enumshort =~ s/([^A-Z])([A-Z])/$1_$2/g;
-	    $enumshort =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;
-	    $enumshort = uc($enumshort);
-
-	    $enumname_prefix = $enumname;
-	    $enumname_prefix =~ s/^([A-Z][a-z]*).*$/$1/;
-	    $enumname_prefix = uc($enumname_prefix);
-
-	    $enumlong = uc($enspace) . "_" . $enumshort;
-	    $enumsym = lc($enspace) . "_" . lc($enumshort);
-
-	    if (defined($option_lowercase_name)) {
-		$enumsym = $option_lowercase_name;
-	    }
-	} else {
-	    $enumshort = $enumname;
-	    if ($idprefix) {
-		$enumshort =~ s/^${idprefix}//;
-	    } else {
-		$enumshort =~ s/^[A-Z][a-z]*//;
-	    }
-	    $enumshort =~ s/([^A-Z])([A-Z])/$1_$2/g;
-	    $enumshort =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;
-	    $enumshort = uc($enumshort);
-
-	    $enumname_prefix = $symprefix && uc($symprefix) || uc($idprefix);
-
-	    $enumlong = $enumname_prefix . "_" . $enumshort;
-	    $enumsym = lc($enumlong);
-	}
-
-	if ($firstenum) {
-	    $firstenum = 0;
-	    
-	    if (length($fprod)) {
-		my $prod = $fprod;
-		my $base = basename ($ARGV);
-
-		$prod =~ s/\@filename\@/$ARGV/g;
-		$prod =~ s/\@basename\@/$base/g;
-		$prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-		$prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-	        chomp ($prod);
-		
-		print "$prod\n";
-	    }
-	}
-	
-	if (length($eprod)) {
-	    my $prod = $eprod;
-
-	    $prod =~ s/\@enum_name\@/$enumsym/g;
-	    $prod =~ s/\@EnumName\@/$enumname/g;
-	    $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-	    $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-	    $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g;
-	    if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-	    if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-	    if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
-	    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-	    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-            chomp ($prod);
-
-	    print "$prod\n";
-	}
-
-	if (length($vhead)) {
-	    my $prod = $vhead;
-
-	    $prod =~ s/\@enum_name\@/$enumsym/g;
-            $prod =~ s/\@EnumName\@/$enumname/g;
-            $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-            $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-	    $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g;
-	    if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-	    if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-	    if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
-            $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-            $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-            chomp ($prod);
-	    
-            print "$prod\n";
-	}
-
-	if (length($vprod)) {
-	    my $prod = $vprod;
-            my $next_num = 0;
-	    
-	    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-	    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-	    for (@entries) {
-		my ($name,$num,$nick) = @{$_};
-		my $tmp_prod = $prod;
-
-                if ($prod =~ /\@valuenum\@/) {
-                    # only attempt to eval the value if it is requested
-                    # this prevents us from throwing errors otherwise
-                    if (defined $num) {
-                        # use sandboxed perl evaluation as a reasonable
-                        # approximation to C constant folding
-                        $num = $sandbox->reval ($num);
-
-                        # make sure it parsed to an integer
-                        if (!defined $num or $num !~ /^-?\d+$/) {
-                            die "Unable to parse enum value '$num'";
-                        }
-                    } else {
-                        $num = $next_num;
-                    }
-
-                    $tmp_prod =~ s/\@valuenum\@/$num/g;
-                    $next_num = $num + 1;
-                }
-
-		$tmp_prod =~ s/\@VALUENAME\@/$name/g;
-		$tmp_prod =~ s/\@valuenick\@/$nick/g;
-		if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; }
-		if ($flags) { $tmp_prod =~ s/\@Type\@/Flags/g; } else { $tmp_prod =~ s/\@Type\@/Enum/g; }
-		if ($flags) { $tmp_prod =~ s/\@TYPE\@/FLAGS/g; } else { $tmp_prod =~ s/\@TYPE\@/ENUM/g; }
-		chomp ($tmp_prod);
-
-		print "$tmp_prod\n";
-	    }
-	}
-
-	if (length($vtail)) {
-	    my $prod = $vtail;
-
-	    $prod =~ s/\@enum_name\@/$enumsym/g;
-            $prod =~ s/\@EnumName\@/$enumname/g;
-            $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-            $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-	    $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g;
-	    if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-	    if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-	    if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
-            $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-            $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-            chomp ($prod);
-	    
-            print "$prod\n";
-	}
-    }
-}
-
-if (length($ftail)) {
-    my $prod = $ftail;
-    my $base = basename ($ARGV);
-
-    $prod =~ s/\@filename\@/$ARGV/g;
-    $prod =~ s/\@basename\@/$base/g;
-    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-    chomp ($prod);
-		
-    print "$prod\n";
-}
-
-# put auto-generation comment
-{
-    my $comment = $comment_tmpl;
-    $comment =~ s/\@comment\@/Generated data ends here/;
-    print "\n" . $comment . "\n\n";
-}
diff --git a/linux-x86/bin/gobject-query b/linux-x86/bin/gobject-query
deleted file mode 100755
index a56c51f..0000000
--- a/linux-x86/bin/gobject-query
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/gresource b/linux-x86/bin/gresource
deleted file mode 100755
index f6af599..0000000
--- a/linux-x86/bin/gresource
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/gsettings b/linux-x86/bin/gsettings
deleted file mode 100755
index 0313479..0000000
--- a/linux-x86/bin/gsettings
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/gtester b/linux-x86/bin/gtester
deleted file mode 100755
index b73f852..0000000
--- a/linux-x86/bin/gtester
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/gtester-report b/linux-x86/bin/gtester-report
deleted file mode 100755
index e278189..0000000
--- a/linux-x86/bin/gtester-report
+++ /dev/null
@@ -1,492 +0,0 @@
-#!/usr/bin/python
-# GLib Testing Framework Utility			-*- Mode: python; -*-
-# Copyright (C) 2007 Imendio AB
-# Authors: Tim Janik
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-import datetime
-import optparse
-import sys, re, xml.dom.minidom
-
-try:
-    import subunit
-    from subunit import iso8601
-    from testtools.content import Content, ContentType
-    mime_utf8 = ContentType('text', 'plain', {'charset': 'utf8'})
-except ImportError:
-    subunit = None
-
-
-pkginstall_configvars = {
-  #@PKGINSTALL_CONFIGVARS_IN24LINES@ # configvars are substituted upon script installation
-}
-
-# xml utilities
-def find_child (node, child_name):
-  for child in node.childNodes:
-    if child.nodeName == child_name:
-      return child
-  return None
-def list_children (node, child_name):
-  rlist = []
-  for child in node.childNodes:
-    if child.nodeName == child_name:
-      rlist += [ child ]
-  return rlist
-def find_node (node, name = None):
-  if not node or node.nodeName == name or not name:
-    return node
-  for child in node.childNodes:
-    c = find_node (child, name)
-    if c:
-      return c
-  return None
-def node_as_text (node, name = None):
-  if name:
-    node = find_node (node, name)
-  txt = ''
-  if node:
-    if node.nodeValue:
-      txt += node.nodeValue
-    for child in node.childNodes:
-      txt += node_as_text (child)
-  return txt
-def attribute_as_text (node, aname, node_name = None):
-  node = find_node (node, node_name)
-  if not node:
-    return ''
-  attr = node.attributes.get (aname, '')
-  if hasattr (attr, 'value'):
-    return attr.value
-  return ''
-
-# HTML utilities
-def html_indent_string (n):
-  uncollapsible_space = ' &nbsp;' # HTML won't compress alternating sequences of ' ' and '&nbsp;'
-  string = ''
-  for i in range (0, (n + 1) / 2):
-    string += uncollapsible_space
-  return string
-
-# TestBinary object, instantiated per test binary in the log file
-class TestBinary:
-  def __init__ (self, name):
-    self.name = name
-    self.testcases = []
-    self.duration = 0
-    self.success_cases = 0
-    self.skipped_cases = 0
-    self.file = '???'
-    self.random_seed = ''
-
-# base class to handle processing/traversion of XML nodes
-class TreeProcess:
-  def __init__ (self):
-    self.nest_level = 0
-  def trampoline (self, node):
-    name = node.nodeName
-    if name == '#text':
-      self.handle_text (node)
-    else:
-      try:	method = getattr (self, 'handle_' + re.sub ('[^a-zA-Z0-9]', '_', name))
-      except:	method = None
-      if method:
-        return method (node)
-      else:
-        return self.process_recursive (name, node)
-  def process_recursive (self, node_name, node):
-    self.process_children (node)
-  def process_children (self, node):
-    self.nest_level += 1
-    for child in node.childNodes:
-      self.trampoline (child)
-    self.nest_level += 1
-
-# test report reader, this class collects some statistics and merges duplicate test binary runs
-class ReportReader (TreeProcess):
-  def __init__ (self):
-    TreeProcess.__init__ (self)
-    self.binary_names = []
-    self.binaries = {}
-    self.last_binary = None
-    self.info = {}
-  def binary_list (self):
-    lst = []
-    for name in self.binary_names:
-      lst += [ self.binaries[name] ]
-    return lst
-  def get_info (self):
-    return self.info
-  def handle_info (self, node):
-    dn = find_child (node, 'package')
-    self.info['package'] = node_as_text (dn)
-    dn = find_child (node, 'version')
-    self.info['version'] = node_as_text (dn)
-    dn = find_child (node, 'revision')
-    if dn is not None:
-        self.info['revision'] = node_as_text (dn)
-  def handle_testcase (self, node):
-    self.last_binary.testcases += [ node ]
-    result = attribute_as_text (node, 'result', 'status')
-    if result == 'success':
-      self.last_binary.success_cases += 1
-    if bool (int (attribute_as_text (node, 'skipped') + '0')):
-      self.last_binary.skipped_cases += 1
-  def handle_text (self, node):
-    pass
-  def handle_testbinary (self, node):
-    path = node.attributes.get ('path', None).value
-    if self.binaries.get (path, -1) == -1:
-      self.binaries[path] = TestBinary (path)
-      self.binary_names += [ path ]
-    self.last_binary = self.binaries[path]
-    dn = find_child (node, 'duration')
-    dur = node_as_text (dn)
-    try:        dur = float (dur)
-    except:     dur = 0
-    if dur:
-      self.last_binary.duration += dur
-    bin = find_child (node, 'binary')
-    if bin:
-      self.last_binary.file = attribute_as_text (bin, 'file')
-    rseed = find_child (node, 'random-seed')
-    if rseed:
-      self.last_binary.random_seed = node_as_text (rseed)
-    self.process_children (node)
-
-
-class ReportWriter(object):
-    """Base class for reporting."""
-
-    def __init__(self, binary_list):
-        self.binaries = binary_list
-
-    def _error_text(self, node):
-        """Get a string representing the error children of node."""
-        rlist = list_children(node, 'error')
-        txt = ''
-        for enode in rlist:
-            txt += node_as_text (enode)
-            if txt and txt[-1] != '\n':
-                txt += '\n'
-        return txt
-
-
-class HTMLReportWriter(ReportWriter):
-  # Javascript/CSS snippet to toggle element visibility
-  cssjs = r'''
-  <style type="text/css" media="screen">
-    .VisibleSection { }
-    .HiddenSection  { display: none; }
-  </style>
-  <script language="javascript" type="text/javascript"><!--
-  function toggle_display (parentid, tagtype, idmatch, keymatch) {
-    ptag = document.getElementById (parentid);
-    tags = ptag.getElementsByTagName (tagtype);
-    for (var i = 0; i < tags.length; i++) {
-      tag = tags[i];
-      var key = tag.getAttribute ("keywords");
-      if (tag.id.indexOf (idmatch) == 0 && key && key.match (keymatch)) {
-        if (tag.className.indexOf ("HiddenSection") >= 0)
-          tag.className = "VisibleSection";
-        else
-          tag.className = "HiddenSection";
-      }
-    }
-  }
-  message_array = Array();
-  function view_testlog (wname, file, random_seed, tcase, msgtitle, msgid) {
-      txt = message_array[msgid];
-      var w = window.open ("", // URI
-                           wname,
-                           "resizable,scrollbars,status,width=790,height=400");
-      var doc = w.document;
-      doc.write ("<h2>File: " + file + "</h2>\n");
-      doc.write ("<h3>Case: " + tcase + "</h3>\n");
-      doc.write ("<strong>Random Seed:</strong> <code>" + random_seed + "</code> <br /><br />\n");
-      doc.write ("<strong>" + msgtitle + "</strong><br />\n");
-      doc.write ("<pre>");
-      doc.write (txt);
-      doc.write ("</pre>\n");
-      doc.write ("<a href=\'javascript:window.close()\'>Close Window</a>\n");
-      doc.close();
-  }
-  --></script>
-  '''
-  def __init__ (self, info, binary_list):
-    ReportWriter.__init__(self, binary_list)
-    self.info = info
-    self.bcounter = 0
-    self.tcounter = 0
-    self.total_tcounter = 0
-    self.total_fcounter = 0
-    self.total_duration = 0
-    self.indent_depth = 0
-    self.lastchar = ''
-  def oprint (self, message):
-    sys.stdout.write (message)
-    if message:
-      self.lastchar = message[-1]
-  def handle_info (self):
-    self.oprint ('<h3>Package: %(package)s, version: %(version)s</h3>\n' % self.info)
-    if self.info['revision']:
-        self.oprint ('<h5>Report generated from: %(revision)s</h5>\n' % self.info)
-  def handle_text (self, node):
-    self.oprint (node.nodeValue)
-  def handle_testcase (self, node, binary):
-    skipped = bool (int (attribute_as_text (node, 'skipped') + '0'))
-    if skipped:
-      return            # skipped tests are uninteresting for HTML reports
-    path = attribute_as_text (node, 'path')
-    duration = node_as_text (node, 'duration')
-    result = attribute_as_text (node, 'result', 'status')
-    rcolor = {
-      'success': 'bgcolor="lightgreen"',
-      'failed':  'bgcolor="red"',
-    }.get (result, '')
-    if result != 'success':
-      duration = '-'    # ignore bogus durations
-    self.oprint ('<tr id="b%u_t%u_" keywords="%s all" class="HiddenSection">\n' % (self.bcounter, self.tcounter, result))
-    self.oprint ('<td>%s %s</td> <td align="right">%s</td> \n' % (html_indent_string (4), path, duration))
-    perflist = list_children (node, 'performance')
-    if result != 'success':
-      txt = self._error_text(node)
-      txt = re.sub (r'"', r'\\"', txt)
-      txt = re.sub (r'\n', r'\\n', txt)
-      txt = re.sub (r'&', r'&amp;', txt)
-      txt = re.sub (r'<', r'&lt;', txt)
-      self.oprint ('<script language="javascript" type="text/javascript">message_array["b%u_t%u_"] = "%s";</script>\n' % (self.bcounter, self.tcounter, txt))
-      self.oprint ('<td align="center"><a href="javascript:view_testlog (\'%s\', \'%s\', \'%s\', \'%s\', \'Output:\', \'b%u_t%u_\')">Details</a></td>\n' %
-                   ('TestResultWindow', binary.file, binary.random_seed, path, self.bcounter, self.tcounter))
-    elif perflist:
-      presults = []
-      for perf in perflist:
-        pmin = bool (int (attribute_as_text (perf, 'minimize')))
-        pmax = bool (int (attribute_as_text (perf, 'maximize')))
-        pval = float (attribute_as_text (perf, 'value'))
-        txt = node_as_text (perf)
-        txt = re.sub (r'&', r'&amp;', txt)
-        txt = re.sub (r'<', r'&gt;', txt)
-        txt = '<strong>Performance(' + (pmin and '<em>minimized</em>' or '<em>maximized</em>') + '):</strong> ' + txt.strip() + '<br />\n'
-        txt = re.sub (r'"', r'\\"', txt)
-        txt = re.sub (r'\n', r'\\n', txt)
-        presults += [ (pval, txt) ]
-      presults.sort()
-      ptxt = ''.join ([e[1] for e in presults])
-      self.oprint ('<script language="javascript" type="text/javascript">message_array["b%u_t%u_"] = "%s";</script>\n' % (self.bcounter, self.tcounter, ptxt))
-      self.oprint ('<td align="center"><a href="javascript:view_testlog (\'%s\', \'%s\', \'%s\', \'%s\', \'Test Results:\', \'b%u_t%u_\')">Details</a></td>\n' %
-                   ('TestResultWindow', binary.file, binary.random_seed, path, self.bcounter, self.tcounter))
-    else:
-      self.oprint ('<td align="center">-</td>\n')
-    self.oprint ('<td align="right" %s>%s</td>\n' % (rcolor, result))
-    self.oprint ('</tr>\n')
-    self.tcounter += 1
-    self.total_tcounter += 1
-    self.total_fcounter += result != 'success'
-  def handle_binary (self, binary):
-    self.tcounter = 1
-    self.bcounter += 1
-    self.total_duration += binary.duration
-    self.oprint ('<tr><td><strong>%s</strong></td><td align="right">%f</td> <td align="center">\n' % (binary.name, binary.duration))
-    erlink, oklink = ('', '')
-    real_cases = len (binary.testcases) - binary.skipped_cases
-    if binary.success_cases < real_cases:
-      erlink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'failed\')"' % self.bcounter
-    if binary.success_cases:
-      oklink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'success\')"' % self.bcounter
-    if real_cases != 0:
-	self.oprint ('<a %s>ER</a>\n' % erlink)
-	self.oprint ('<a %s>OK</a>\n' % oklink)
-	self.oprint ('</td>\n')
-	perc = binary.success_cases * 100.0 / real_cases
-	pcolor = {
-	  100 : 'bgcolor="lightgreen"',
-	  0   : 'bgcolor="red"',
-	}.get (int (perc), 'bgcolor="yellow"')
-	self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc))
-	self.oprint ('</tr>\n')
-    else:
-	self.oprint ('Empty\n')
-	self.oprint ('</td>\n')
-	self.oprint ('</tr>\n')
-    for tc in binary.testcases:
-      self.handle_testcase (tc, binary)
-  def handle_totals (self):
-    self.oprint ('<tr>')
-    self.oprint ('<td><strong>Totals:</strong> %u Binaries, %u Tests, %u Failed, %u Succeeded</td>' %
-                 (self.bcounter, self.total_tcounter, self.total_fcounter, self.total_tcounter - self.total_fcounter))
-    self.oprint ('<td align="right">%f</td>\n' % self.total_duration)
-    self.oprint ('<td align="center">-</td>\n')
-    if self.total_tcounter != 0:
-        perc = (self.total_tcounter - self.total_fcounter) * 100.0 / self.total_tcounter
-    else:
-        perc = 0.0
-    pcolor = {
-      100 : 'bgcolor="lightgreen"',
-      0   : 'bgcolor="red"',
-    }.get (int (perc), 'bgcolor="yellow"')
-    self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc))
-    self.oprint ('</tr>\n')
-  def printout (self):
-    self.oprint ('<html><head>\n')
-    self.oprint ('<title>GTester Unit Test Report</title>\n')
-    self.oprint (self.cssjs)
-    self.oprint ('</head>\n')
-    self.oprint ('<body>\n')
-    self.oprint ('<h2>GTester Unit Test Report</h2>\n')
-    self.handle_info ()
-    self.oprint ('<table id="ResultTable" width="100%" border="1">\n<tr>\n')
-    self.oprint ('<th>Program / Testcase </th>\n')
-    self.oprint ('<th style="width:8em">Duration (sec)</th>\n')
-    self.oprint ('<th style="width:5em">View</th>\n')
-    self.oprint ('<th style="width:5em">Result</th>\n')
-    self.oprint ('</tr>\n')
-    for tb in self.binaries:
-      self.handle_binary (tb)
-    self.handle_totals()
-    self.oprint ('</table>\n')
-    self.oprint ('</body>\n')
-    self.oprint ('</html>\n')
-
-
-class SubunitWriter(ReportWriter):
-    """Reporter to output a subunit stream."""
-
-    def printout(self):
-        reporter = subunit.TestProtocolClient(sys.stdout)
-        for binary in self.binaries:
-            for tc in binary.testcases:
-                test = GTestCase(tc, binary)
-                test.run(reporter)
-
-
-class GTestCase(object):
-    """A representation of a gtester test result as a pyunit TestCase."""
-
-    def __init__(self, case, binary):
-        """Create a GTestCase for case 'case' from binary program 'binary'."""
-        self._case = case
-        self._binary = binary
-        # the name of the case - e.g. /dbusmenu/glib/objects/menuitem/props_boolstr
-        self._path = attribute_as_text(self._case, 'path')
-
-    def id(self):
-        """What test is this? Returns the gtester path for the testcase."""
-        return self._path
-
-    def _get_details(self):
-        """Calculate a details dict for the test - attachments etc."""
-        details = {}
-        result = attribute_as_text(self._case, 'result', 'status')
-        details['filename'] = Content(mime_utf8, lambda:[self._binary.file])
-        details['random_seed'] = Content(mime_utf8,
-            lambda:[self._binary.random_seed])
-        if self._get_outcome() == 'addFailure':
-            # Extract the error details. Skips have no details because its not
-            # skip like unittest does, instead the runner just bypasses N test.
-            txt = self._error_text(self._case)
-            details['error'] = Content(mime_utf8, lambda:[txt])
-        if self._get_outcome() == 'addSuccess':
-            # Sucessful tests may have performance metrics.
-            perflist = list_children(self._case, 'performance')
-            if perflist:
-                presults = []
-                for perf in perflist:
-                    pmin = bool (int (attribute_as_text (perf, 'minimize')))
-                    pmax = bool (int (attribute_as_text (perf, 'maximize')))
-                    pval = float (attribute_as_text (perf, 'value'))
-                    txt = node_as_text (perf)
-                    txt = 'Performance(' + (pmin and 'minimized' or 'maximized'
-                        ) + '): ' + txt.strip() + '\n'
-                    presults += [(pval, txt)]
-                presults.sort()
-                perf_details = [e[1] for e in presults]
-                details['performance'] = Content(mime_utf8, lambda:perf_details)
-        return details
-
-    def _get_outcome(self):
-        if int(attribute_as_text(self._case, 'skipped') + '0'):
-            return 'addSkip'
-        outcome = attribute_as_text(self._case, 'result', 'status')
-        if outcome == 'success':
-            return 'addSuccess'
-        else:
-            return 'addFailure'
-
-    def run(self, result):
-        time = datetime.datetime.utcnow().replace(tzinfo=iso8601.Utc())
-        result.time(time)
-        result.startTest(self)
-        try:
-            outcome = self._get_outcome()
-            details = self._get_details()
-            # Only provide a duration IFF outcome == 'addSuccess' - the main
-            # parser claims bogus results otherwise: in that case emit time as
-            # zero perhaps.
-            if outcome == 'addSuccess':
-                duration = float(node_as_text(self._case, 'duration'))
-                duration = duration * 1000000
-                timedelta = datetime.timedelta(0, 0, duration)
-                time = time + timedelta
-                result.time(time)
-            getattr(result, outcome)(self, details=details)
-        finally:
-            result.stopTest(self)
-
-
-
-# main program handling
-def parse_opts():
-    """Parse program options.
-
-    :return: An options object and the program arguments.
-    """
-    parser = optparse.OptionParser()
-    parser.version =  pkginstall_configvars.get ('glib-version', '0.0-uninstalled')
-    parser.usage = "%prog [OPTIONS] <gtester-log.xml>"
-    parser.description = "Generate HTML reports from the XML log files generated by gtester."
-    parser.epilog = "gtester-report (GLib utils) version %s."% (parser.version,)
-    parser.add_option("-v", "--version", action="store_true", dest="version", default=False,
-        help="Show program version.")
-    parser.add_option("-s", "--subunit", action="store_true", dest="subunit", default=False,
-        help="Output subunit [See https://launchpad.net/subunit/"
-            " Needs python-subunit]")
-    options, files = parser.parse_args()
-    if options.version:
-        print parser.epilog
-        return None, None
-    if len(files) != 1:
-        parser.error("Must supply a log file to parse.")
-    if options.subunit and subunit is None:
-        parser.error("python-subunit is not installed.")
-    return options, files
-
-
-def main():
-  options, files = parse_opts()
-  if options is None:
-    return 0
-  xd = xml.dom.minidom.parse (files[0])
-  rr = ReportReader()
-  rr.trampoline (xd)
-  if not options.subunit:
-      HTMLReportWriter(rr.get_info(), rr.binary_list()).printout()
-  else:
-      SubunitWriter(rr.get_info(), rr.binary_list()).printout()
-
-
-if __name__ == '__main__':
-  main()
diff --git a/linux-x86/bin/libpng-config b/linux-x86/bin/libpng-config
deleted file mode 120000
index ae3d3d4..0000000
--- a/linux-x86/bin/libpng-config
+++ /dev/null
@@ -1 +0,0 @@
-libpng16-config
\ No newline at end of file
diff --git a/linux-x86/bin/libpng16-config b/linux-x86/bin/libpng16-config
deleted file mode 100755
index 6299dc6..0000000
--- a/linux-x86/bin/libpng16-config
+++ /dev/null
@@ -1,127 +0,0 @@
-#! /bin/sh
-
-# libpng-config
-# provides configuration info for libpng.
-
-# Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Modeled after libxml-config.
-
-version="1.6.16"
-prefix="/tmp/digit-build-temp-464/install-linux-x86"
-exec_prefix="${prefix}"
-libdir="${exec_prefix}/lib"
-includedir="${prefix}/include/libpng16"
-libs="-lpng16"
-all_libs="-lpng16 -lm -lz -lm "
-I_opts="-I${includedir}"
-L_opts="-L${libdir}"
-R_opts=""
-cppflags=""
-ccopts=""
-ldopts=""
-
-usage()
-{
-    cat <<EOF
-Usage: $0 [OPTION] ...
-
-Known values for OPTION are:
-
-  --prefix        print libpng prefix
-  --libdir        print path to directory containing library
-  --libs          print library linking information
-  --ccopts        print compiler options
-  --cppflags      print pre-processor flags
-  --cflags        print preprocessor flags, I_opts, and compiler options
-  --I_opts        print "-I" include options
-  --L_opts        print linker "-L" flags for dynamic linking
-  --R_opts        print dynamic linker "-R" or "-rpath" flags
-  --ldopts        print linker options
-  --ldflags       print linker flags (ldopts, L_opts, R_opts, and libs)
-  --static        revise subsequent outputs for static linking
-  --help          print this help and exit
-  --version       print version information
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-while test $# -gt 0; do
-    case "$1" in
-
-    --prefix)
-        echo ${prefix}
-        ;;
-
-    --version)
-        echo ${version}
-        exit 0
-        ;;
-
-    --help)
-        usage 0
-        ;;
-
-    --ccopts)
-        echo ${ccopts}
-        ;;
-
-    --cppflags)
-        echo ${cppflags}
-        ;;
-
-    --cflags)
-        echo ${I_opts} ${cppflags} ${ccopts}
-        ;;
-
-    --libdir)
-        echo ${libdir}
-        ;;
-
-    --libs)
-        echo ${libs}
-        ;;
-
-    --I_opts)
-        echo ${I_opts}
-        ;;
-
-    --L_opts)
-        echo ${L_opts}
-        ;;
-
-    --R_opts)
-        echo ${R_opts}
-        ;;
-
-    --ldopts)
-        echo ${ldopts}
-        ;;
-
-    --ldflags)
-        echo ${ldopts} ${L_opts} ${R_opts} ${libs}
-        ;;
-
-    --static)
-        R_opts=""
-        libs=${all_libs}
-        ;;
-
-    *)
-        usage
-        exit 1
-        ;;
-    esac
-    shift
-done
-
-exit 0
diff --git a/linux-x86/bin/pkg-config b/linux-x86/bin/pkg-config
deleted file mode 100755
index dcc0e87..0000000
--- a/linux-x86/bin/pkg-config
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/png-fix-itxt b/linux-x86/bin/png-fix-itxt
deleted file mode 100755
index 422fd39..0000000
--- a/linux-x86/bin/png-fix-itxt
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/pngfix b/linux-x86/bin/pngfix
deleted file mode 100755
index 1228698..0000000
--- a/linux-x86/bin/pngfix
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/sdl2-config b/linux-x86/bin/sdl2-config
deleted file mode 100755
index d016258..0000000
--- a/linux-x86/bin/sdl2-config
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-exec_prefix_set=no
-libdir=${exec_prefix}/lib
-
-#usage="\
-#Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
-usage="\
-Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
-
-if test $# -eq 0; then
-      echo "${usage}" 1>&2
-      exit 1
-fi
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      if test $exec_prefix_set = no ; then
-        exec_prefix=$optarg
-      fi
-      ;;
-    --prefix)
-      echo $prefix
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      exec_prefix_set=yes
-      ;;
-    --exec-prefix)
-      echo $exec_prefix
-      ;;
-    --version)
-      echo 2.0.3
-      ;;
-    --cflags)
-      echo -I${prefix}/include/SDL2   -D_REENTRANT
-      ;;
-#    --libs)
-#      echo -L${exec_prefix}/lib -Wl,-rpath,${libdir} -lSDL2  -lpthread
-#      ;;
-#    --static-libs)
-    --libs|--static-libs)
-      echo -L${exec_prefix}/lib -Wl,-rpath,${libdir} -lSDL2  -lpthread  -Wl,--no-undefined -lm -ldl -lpthread -lrt
-      ;;
-    *)
-      echo "${usage}" 1>&2
-      exit 1
-      ;;
-  esac
-  shift
-done
diff --git a/linux-x86/include/SDL2/SDL.h b/linux-x86/include/SDL2/SDL.h
deleted file mode 100644
index a907709..0000000
--- a/linux-x86/include/SDL2/SDL.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL.h
- *
- *  Main include header for the SDL library
- */
-
-/**
- *  \mainpage Simple DirectMedia Layer (SDL)
- *
- *  http://www.libsdl.org/
- *
- *  \section intro_sec Introduction
- *
- *  Simple DirectMedia Layer is a cross-platform development library designed
- *  to provide low level access to audio, keyboard, mouse, joystick, and
- *  graphics hardware via OpenGL and Direct3D. It is used by video playback
- *  software, emulators, and popular games including Valve's award winning
- *  catalog and many Humble Bundle games.
- *
- *  SDL officially supports Windows, Mac OS X, Linux, iOS, and Android.
- *  Support for other platforms may be found in the source code.
- *
- *  SDL is written in C, works natively with C++, and there are bindings 
- *  available for several other languages, including C# and Python.
- *
- *  This library is distributed under the zlib license, which can be found
- *  in the file "COPYING.txt".
- *
- *  The best way to learn how to use SDL is to check out the header files in
- *  the "include" subdirectory and the programs in the "test" subdirectory.
- *  The header files and test programs are well commented and always up to date.
- *  More documentation and FAQs are available online at:
- *      http://wiki.libsdl.org/
- *
- *  If you need help with the library, or just want to discuss SDL related
- *  issues, you can join the developers mailing list:
- *      http://www.libsdl.org/mailing-list.php
- *
- *  Enjoy!
- *      Sam Lantinga                (slouken@libsdl.org)
- */
-
-#ifndef _SDL_H
-#define _SDL_H
-
-#include "SDL_main.h"
-#include "SDL_stdinc.h"
-#include "SDL_assert.h"
-#include "SDL_atomic.h"
-#include "SDL_audio.h"
-#include "SDL_clipboard.h"
-#include "SDL_cpuinfo.h"
-#include "SDL_endian.h"
-#include "SDL_error.h"
-#include "SDL_events.h"
-#include "SDL_filesystem.h"
-#include "SDL_joystick.h"
-#include "SDL_gamecontroller.h"
-#include "SDL_haptic.h"
-#include "SDL_hints.h"
-#include "SDL_loadso.h"
-#include "SDL_log.h"
-#include "SDL_messagebox.h"
-#include "SDL_mutex.h"
-#include "SDL_power.h"
-#include "SDL_render.h"
-#include "SDL_rwops.h"
-#include "SDL_system.h"
-#include "SDL_thread.h"
-#include "SDL_timer.h"
-#include "SDL_version.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* As of version 0.5, SDL is loaded dynamically into the application */
-
-/**
- *  \name SDL_INIT_*
- *
- *  These are the flags which may be passed to SDL_Init().  You should
- *  specify the subsystems which you will be using in your application.
- */
-/* @{ */
-#define SDL_INIT_TIMER          0x00000001
-#define SDL_INIT_AUDIO          0x00000010
-#define SDL_INIT_VIDEO          0x00000020  /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */
-#define SDL_INIT_JOYSTICK       0x00000200  /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */
-#define SDL_INIT_HAPTIC         0x00001000
-#define SDL_INIT_GAMECONTROLLER 0x00002000  /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */
-#define SDL_INIT_EVENTS         0x00004000
-#define SDL_INIT_NOPARACHUTE    0x00100000  /**< Don't catch fatal signals */
-#define SDL_INIT_EVERYTHING ( \
-                SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
-                SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \
-            )
-/* @} */
-
-/**
- *  This function initializes  the subsystems specified by \c flags
- *  Unless the ::SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
- *  signal handlers for some commonly ignored fatal signals (like SIGSEGV).
- */
-extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
-
-/**
- *  This function initializes specific SDL subsystems
- */
-extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
-
-/**
- *  This function cleans up specific SDL subsystems
- */
-extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
-
-/**
- *  This function returns a mask of the specified subsystems which have
- *  previously been initialized.
- *
- *  If \c flags is 0, it returns a mask of all initialized subsystems.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
-
-/**
- *  This function cleans up all initialized subsystems. You should
- *  call it upon all exit conditions.
- */
-extern DECLSPEC void SDLCALL SDL_Quit(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_assert.h b/linux-x86/include/SDL2/SDL_assert.h
deleted file mode 100644
index 42348f7..0000000
--- a/linux-x86/include/SDL2/SDL_assert.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_assert_h
-#define _SDL_assert_h
-
-#include "SDL_config.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef SDL_ASSERT_LEVEL
-#ifdef SDL_DEFAULT_ASSERT_LEVEL
-#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL
-#elif defined(_DEBUG) || defined(DEBUG) || \
-      (defined(__GNUC__) && !defined(__OPTIMIZE__))
-#define SDL_ASSERT_LEVEL 2
-#else
-#define SDL_ASSERT_LEVEL 1
-#endif
-#endif /* SDL_ASSERT_LEVEL */
-
-/*
-These are macros and not first class functions so that the debugger breaks
-on the assertion line and not in some random guts of SDL, and so each
-assert can have unique static variables associated with it.
-*/
-
-#if defined(_MSC_VER)
-/* Don't include intrin.h here because it contains C++ code */
-    extern void __cdecl __debugbreak(void);
-    #define SDL_TriggerBreakpoint() __debugbreak()
-#elif (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
-    #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
-#elif defined(HAVE_SIGNAL_H)
-    #include <signal.h>
-    #define SDL_TriggerBreakpoint() raise(SIGTRAP)
-#else
-    /* How do we trigger breakpoints on this platform? */
-    #define SDL_TriggerBreakpoint()
-#endif
-
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */
-#   define SDL_FUNCTION __func__
-#elif ((__GNUC__ >= 2) || defined(_MSC_VER))
-#   define SDL_FUNCTION __FUNCTION__
-#else
-#   define SDL_FUNCTION "???"
-#endif
-#define SDL_FILE    __FILE__
-#define SDL_LINE    __LINE__
-
-/*
-sizeof (x) makes the compiler still parse the expression even without
-assertions enabled, so the code is always checked at compile time, but
-doesn't actually generate code for it, so there are no side effects or
-expensive checks at run time, just the constant size of what x WOULD be,
-which presumably gets optimized out as unused.
-This also solves the problem of...
-
-    int somevalue = blah();
-    SDL_assert(somevalue == 1);
-
-...which would cause compiles to complain that somevalue is unused if we
-disable assertions.
-*/
-
-#ifdef _MSC_VER  /* stupid /W4 warnings. */
-#define SDL_NULL_WHILE_LOOP_CONDITION (-1 == __LINE__)
-#else
-#define SDL_NULL_WHILE_LOOP_CONDITION (0)
-#endif
-
-#define SDL_disabled_assert(condition) \
-    do { (void) sizeof ((condition)); } while (SDL_NULL_WHILE_LOOP_CONDITION)
-
-typedef enum
-{
-    SDL_ASSERTION_RETRY,  /**< Retry the assert immediately. */
-    SDL_ASSERTION_BREAK,  /**< Make the debugger trigger a breakpoint. */
-    SDL_ASSERTION_ABORT,  /**< Terminate the program. */
-    SDL_ASSERTION_IGNORE,  /**< Ignore the assert. */
-    SDL_ASSERTION_ALWAYS_IGNORE  /**< Ignore the assert from now on. */
-} SDL_assert_state;
-
-typedef struct SDL_assert_data
-{
-    int always_ignore;
-    unsigned int trigger_count;
-    const char *condition;
-    const char *filename;
-    int linenum;
-    const char *function;
-    const struct SDL_assert_data *next;
-} SDL_assert_data;
-
-#if (SDL_ASSERT_LEVEL > 0)
-
-/* Never call this directly. Use the SDL_assert* macros. */
-extern DECLSPEC SDL_assert_state SDLCALL SDL_ReportAssertion(SDL_assert_data *,
-                                                             const char *,
-                                                             const char *, int)
-#if defined(__clang__)
-#if __has_feature(attribute_analyzer_noreturn)
-/* this tells Clang's static analysis that we're a custom assert function,
-   and that the analyzer should assume the condition was always true past this
-   SDL_assert test. */
-   __attribute__((analyzer_noreturn))
-#endif
-#endif
-;
-
-/* the do {} while(0) avoids dangling else problems:
-    if (x) SDL_assert(y); else blah();
-       ... without the do/while, the "else" could attach to this macro's "if".
-   We try to handle just the minimum we need here in a macro...the loop,
-   the static vars, and break points. The heavy lifting is handled in
-   SDL_ReportAssertion(), in SDL_assert.c.
-*/
-#define SDL_enabled_assert(condition) \
-    do { \
-        while ( !(condition) ) { \
-            static struct SDL_assert_data assert_data = { \
-                0, 0, #condition, 0, 0, 0, 0 \
-            }; \
-            const SDL_assert_state state = SDL_ReportAssertion(&assert_data, \
-                                                               SDL_FUNCTION, \
-                                                               SDL_FILE, \
-                                                               SDL_LINE); \
-            if (state == SDL_ASSERTION_RETRY) { \
-                continue; /* go again. */ \
-            } else if (state == SDL_ASSERTION_BREAK) { \
-                SDL_TriggerBreakpoint(); \
-            } \
-            break; /* not retrying. */ \
-        } \
-    } while (SDL_NULL_WHILE_LOOP_CONDITION)
-
-#endif  /* enabled assertions support code */
-
-/* Enable various levels of assertions. */
-#if SDL_ASSERT_LEVEL == 0   /* assertions disabled */
-#   define SDL_assert(condition) SDL_disabled_assert(condition)
-#   define SDL_assert_release(condition) SDL_disabled_assert(condition)
-#   define SDL_assert_paranoid(condition) SDL_disabled_assert(condition)
-#elif SDL_ASSERT_LEVEL == 1  /* release settings. */
-#   define SDL_assert(condition) SDL_disabled_assert(condition)
-#   define SDL_assert_release(condition) SDL_enabled_assert(condition)
-#   define SDL_assert_paranoid(condition) SDL_disabled_assert(condition)
-#elif SDL_ASSERT_LEVEL == 2  /* normal settings. */
-#   define SDL_assert(condition) SDL_enabled_assert(condition)
-#   define SDL_assert_release(condition) SDL_enabled_assert(condition)
-#   define SDL_assert_paranoid(condition) SDL_disabled_assert(condition)
-#elif SDL_ASSERT_LEVEL == 3  /* paranoid settings. */
-#   define SDL_assert(condition) SDL_enabled_assert(condition)
-#   define SDL_assert_release(condition) SDL_enabled_assert(condition)
-#   define SDL_assert_paranoid(condition) SDL_enabled_assert(condition)
-#else
-#   error Unknown assertion level.
-#endif
-
-/* this assertion is never disabled at any level. */
-#define SDL_assert_always(condition) SDL_enabled_assert(condition)
-
-
-typedef SDL_assert_state (SDLCALL *SDL_AssertionHandler)(
-                                 const SDL_assert_data* data, void* userdata);
-
-/**
- *  \brief Set an application-defined assertion handler.
- *
- *  This allows an app to show its own assertion UI and/or force the
- *  response to an assertion failure. If the app doesn't provide this, SDL
- *  will try to do the right thing, popping up a system-specific GUI dialog,
- *  and probably minimizing any fullscreen windows.
- *
- *  This callback may fire from any thread, but it runs wrapped in a mutex, so
- *  it will only fire from one thread at a time.
- *
- *  Setting the callback to NULL restores SDL's original internal handler.
- *
- *  This callback is NOT reset to SDL's internal handler upon SDL_Quit()!
- *
- *  \return SDL_assert_state value of how to handle the assertion failure.
- *
- *  \param handler Callback function, called when an assertion fails.
- *  \param userdata A pointer passed to the callback as-is.
- */
-extern DECLSPEC void SDLCALL SDL_SetAssertionHandler(
-                                            SDL_AssertionHandler handler,
-                                            void *userdata);
-
-/**
- *  \brief Get the default assertion handler.
- *
- *  This returns the function pointer that is called by default when an
- *   assertion is triggered. This is an internal function provided by SDL,
- *   that is used for assertions when SDL_SetAssertionHandler() hasn't been
- *   used to provide a different function.
- *
- *  \return The default SDL_AssertionHandler that is called when an assert triggers.
- */
-extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetDefaultAssertionHandler(void);
-
-/**
- *  \brief Get the current assertion handler.
- *
- *  This returns the function pointer that is called when an assertion is
- *   triggered. This is either the value last passed to
- *   SDL_SetAssertionHandler(), or if no application-specified function is
- *   set, is equivalent to calling SDL_GetDefaultAssertionHandler().
- *
- *   \param puserdata Pointer to a void*, which will store the "userdata"
- *                    pointer that was passed to SDL_SetAssertionHandler().
- *                    This value will always be NULL for the default handler.
- *                    If you don't care about this data, it is safe to pass
- *                    a NULL pointer to this function to ignore it.
- *  \return The SDL_AssertionHandler that is called when an assert triggers.
- */
-extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puserdata);
-
-/**
- *  \brief Get a list of all assertion failures.
- *
- *  Get all assertions triggered since last call to SDL_ResetAssertionReport(),
- *  or the start of the program.
- *
- *  The proper way to examine this data looks something like this:
- *
- *  <code>
- *  const SDL_assert_data *item = SDL_GetAssertionReport();
- *  while (item) {
- *      printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n",
- *             item->condition, item->function, item->filename,
- *             item->linenum, item->trigger_count,
- *             item->always_ignore ? "yes" : "no");
- *      item = item->next;
- *  }
- *  </code>
- *
- *  \return List of all assertions.
- *  \sa SDL_ResetAssertionReport
- */
-extern DECLSPEC const SDL_assert_data * SDLCALL SDL_GetAssertionReport(void);
-
-/**
- *  \brief Reset the list of all assertion failures.
- *
- *  Reset list of all assertions triggered.
- *
- *  \sa SDL_GetAssertionReport
- */
-extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_assert_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_atomic.h b/linux-x86/include/SDL2/SDL_atomic.h
deleted file mode 100644
index bb3a9b6..0000000
--- a/linux-x86/include/SDL2/SDL_atomic.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- * \file SDL_atomic.h
- *
- * Atomic operations.
- *
- * IMPORTANT:
- * If you are not an expert in concurrent lockless programming, you should
- * only be using the atomic lock and reference counting functions in this
- * file.  In all other cases you should be protecting your data structures
- * with full mutexes.
- *
- * The list of "safe" functions to use are:
- *  SDL_AtomicLock()
- *  SDL_AtomicUnlock()
- *  SDL_AtomicIncRef()
- *  SDL_AtomicDecRef()
- *
- * Seriously, here be dragons!
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
- *
- * You can find out a little more about lockless programming and the
- * subtle issues that can arise here:
- * http://msdn.microsoft.com/en-us/library/ee418650%28v=vs.85%29.aspx
- *
- * There's also lots of good information here:
- * http://www.1024cores.net/home/lock-free-algorithms
- * http://preshing.com/
- *
- * These operations may or may not actually be implemented using
- * processor specific atomic operations. When possible they are
- * implemented as true processor specific atomic operations. When that
- * is not possible the are implemented using locks that *do* use the
- * available atomic operations.
- *
- * All of the atomic operations that modify memory are full memory barriers.
- */
-
-#ifndef _SDL_atomic_h_
-#define _SDL_atomic_h_
-
-#include "SDL_stdinc.h"
-#include "SDL_platform.h"
-
-#include "begin_code.h"
-
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \name SDL AtomicLock
- *
- * The atomic locks are efficient spinlocks using CPU instructions,
- * but are vulnerable to starvation and can spin forever if a thread
- * holding a lock has been terminated.  For this reason you should
- * minimize the code executed inside an atomic lock and never do
- * expensive things like API or system calls while holding them.
- *
- * The atomic locks are not safe to lock recursively.
- *
- * Porting Note:
- * The spin lock functions and type are required and can not be
- * emulated because they are used in the atomic emulation code.
- */
-/* @{ */
-
-typedef int SDL_SpinLock;
-
-/**
- * \brief Try to lock a spin lock by setting it to a non-zero value.
- *
- * \param lock Points to the lock.
- *
- * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_AtomicTryLock(SDL_SpinLock *lock);
-
-/**
- * \brief Lock a spin lock by setting it to a non-zero value.
- *
- * \param lock Points to the lock.
- */
-extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock);
-
-/**
- * \brief Unlock a spin lock by setting it to 0. Always returns immediately
- *
- * \param lock Points to the lock.
- */
-extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock);
-
-/* @} *//* SDL AtomicLock */
-
-
-/**
- * The compiler barrier prevents the compiler from reordering
- * reads and writes to globally visible variables across the call.
- */
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-void _ReadWriteBarrier(void);
-#pragma intrinsic(_ReadWriteBarrier)
-#define SDL_CompilerBarrier()   _ReadWriteBarrier()
-#elif defined(__GNUC__)
-#define SDL_CompilerBarrier()   __asm__ __volatile__ ("" : : : "memory")
-#else
-#define SDL_CompilerBarrier()   \
-{ SDL_SpinLock _tmp = 0; SDL_AtomicLock(&_tmp); SDL_AtomicUnlock(&_tmp); }
-#endif
-
-/**
- * Memory barriers are designed to prevent reads and writes from being
- * reordered by the compiler and being seen out of order on multi-core CPUs.
- *
- * A typical pattern would be for thread A to write some data and a flag,
- * and for thread B to read the flag and get the data. In this case you
- * would insert a release barrier between writing the data and the flag,
- * guaranteeing that the data write completes no later than the flag is
- * written, and you would insert an acquire barrier between reading the
- * flag and reading the data, to ensure that all the reads associated
- * with the flag have completed.
- *
- * In this pattern you should always see a release barrier paired with
- * an acquire barrier and you should gate the data reads/writes with a
- * single flag variable.
- *
- * For more information on these semantics, take a look at the blog post:
- * http://preshing.com/20120913/acquire-and-release-semantics
- */
-#if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("lwsync" : : : "memory")
-#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("lwsync" : : : "memory")
-#elif defined(__GNUC__) && defined(__arm__)
-#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__)
-#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("dmb ish" : : : "memory")
-#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("dmb ish" : : : "memory")
-#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__)
-#ifdef __thumb__
-/* The mcr instruction isn't available in thumb mode, use real functions */
-extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease();
-extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire();
-#else
-#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
-#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
-#endif /* __thumb__ */
-#else
-#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("" : : : "memory")
-#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("" : : : "memory")
-#endif /* __GNUC__ && __arm__ */
-#else
-/* This is correct for the x86 and x64 CPUs, and we'll expand this over time. */
-#define SDL_MemoryBarrierRelease()  SDL_CompilerBarrier()
-#define SDL_MemoryBarrierAcquire()  SDL_CompilerBarrier()
-#endif
-
-/**
- * \brief A type representing an atomic integer value.  It is a struct
- *        so people don't accidentally use numeric operations on it.
- */
-typedef struct { int value; } SDL_atomic_t;
-
-/**
- * \brief Set an atomic variable to a new value if it is currently an old value.
- *
- * \return SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise.
- *
- * \note If you don't know what this function is for, you shouldn't use it!
-*/
-extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval);
-
-/**
- * \brief Set an atomic variable to a value.
- *
- * \return The previous value of the atomic variable.
- */
-extern DECLSPEC int SDLCALL SDL_AtomicSet(SDL_atomic_t *a, int v);
-
-/**
- * \brief Get the value of an atomic variable
- */
-extern DECLSPEC int SDLCALL SDL_AtomicGet(SDL_atomic_t *a);
-
-/**
- * \brief Add to an atomic variable.
- *
- * \return The previous value of the atomic variable.
- *
- * \note This same style can be used for any number operation
- */
-extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v);
-
-/**
- * \brief Increment an atomic variable used as a reference count.
- */
-#ifndef SDL_AtomicIncRef
-#define SDL_AtomicIncRef(a)    SDL_AtomicAdd(a, 1)
-#endif
-
-/**
- * \brief Decrement an atomic variable used as a reference count.
- *
- * \return SDL_TRUE if the variable reached zero after decrementing,
- *         SDL_FALSE otherwise
- */
-#ifndef SDL_AtomicDecRef
-#define SDL_AtomicDecRef(a)    (SDL_AtomicAdd(a, -1) == 1)
-#endif
-
-/**
- * \brief Set a pointer to a new value if it is currently an old value.
- *
- * \return SDL_TRUE if the pointer was set, SDL_FALSE otherwise.
- *
- * \note If you don't know what this function is for, you shouldn't use it!
-*/
-extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCASPtr(void **a, void *oldval, void *newval);
-
-/**
- * \brief Set a pointer to a value atomically.
- *
- * \return The previous value of the pointer.
- */
-extern DECLSPEC void* SDLCALL SDL_AtomicSetPtr(void **a, void* v);
-
-/**
- * \brief Get the value of a pointer atomically.
- */
-extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-
-#include "close_code.h"
-
-#endif /* _SDL_atomic_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_audio.h b/linux-x86/include/SDL2/SDL_audio.h
deleted file mode 100644
index 4c987d5..0000000
--- a/linux-x86/include/SDL2/SDL_audio.h
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_audio.h
- *
- *  Access to the raw audio mixing buffer for the SDL library.
- */
-
-#ifndef _SDL_audio_h
-#define _SDL_audio_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_endian.h"
-#include "SDL_mutex.h"
-#include "SDL_thread.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \brief Audio format flags.
- *
- *  These are what the 16 bits in SDL_AudioFormat currently mean...
- *  (Unspecified bits are always zero).
- *
- *  \verbatim
-    ++-----------------------sample is signed if set
-    ||
-    ||       ++-----------sample is bigendian if set
-    ||       ||
-    ||       ||          ++---sample is float if set
-    ||       ||          ||
-    ||       ||          || +---sample bit size---+
-    ||       ||          || |                     |
-    15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00
-    \endverbatim
- *
- *  There are macros in SDL 2.0 and later to query these bits.
- */
-typedef Uint16 SDL_AudioFormat;
-
-/**
- *  \name Audio flags
- */
-/* @{ */
-
-#define SDL_AUDIO_MASK_BITSIZE       (0xFF)
-#define SDL_AUDIO_MASK_DATATYPE      (1<<8)
-#define SDL_AUDIO_MASK_ENDIAN        (1<<12)
-#define SDL_AUDIO_MASK_SIGNED        (1<<15)
-#define SDL_AUDIO_BITSIZE(x)         (x & SDL_AUDIO_MASK_BITSIZE)
-#define SDL_AUDIO_ISFLOAT(x)         (x & SDL_AUDIO_MASK_DATATYPE)
-#define SDL_AUDIO_ISBIGENDIAN(x)     (x & SDL_AUDIO_MASK_ENDIAN)
-#define SDL_AUDIO_ISSIGNED(x)        (x & SDL_AUDIO_MASK_SIGNED)
-#define SDL_AUDIO_ISINT(x)           (!SDL_AUDIO_ISFLOAT(x))
-#define SDL_AUDIO_ISLITTLEENDIAN(x)  (!SDL_AUDIO_ISBIGENDIAN(x))
-#define SDL_AUDIO_ISUNSIGNED(x)      (!SDL_AUDIO_ISSIGNED(x))
-
-/**
- *  \name Audio format flags
- *
- *  Defaults to LSB byte order.
- */
-/* @{ */
-#define AUDIO_U8        0x0008  /**< Unsigned 8-bit samples */
-#define AUDIO_S8        0x8008  /**< Signed 8-bit samples */
-#define AUDIO_U16LSB    0x0010  /**< Unsigned 16-bit samples */
-#define AUDIO_S16LSB    0x8010  /**< Signed 16-bit samples */
-#define AUDIO_U16MSB    0x1010  /**< As above, but big-endian byte order */
-#define AUDIO_S16MSB    0x9010  /**< As above, but big-endian byte order */
-#define AUDIO_U16       AUDIO_U16LSB
-#define AUDIO_S16       AUDIO_S16LSB
-/* @} */
-
-/**
- *  \name int32 support
- */
-/* @{ */
-#define AUDIO_S32LSB    0x8020  /**< 32-bit integer samples */
-#define AUDIO_S32MSB    0x9020  /**< As above, but big-endian byte order */
-#define AUDIO_S32       AUDIO_S32LSB
-/* @} */
-
-/**
- *  \name float32 support
- */
-/* @{ */
-#define AUDIO_F32LSB    0x8120  /**< 32-bit floating point samples */
-#define AUDIO_F32MSB    0x9120  /**< As above, but big-endian byte order */
-#define AUDIO_F32       AUDIO_F32LSB
-/* @} */
-
-/**
- *  \name Native audio byte ordering
- */
-/* @{ */
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define AUDIO_U16SYS    AUDIO_U16LSB
-#define AUDIO_S16SYS    AUDIO_S16LSB
-#define AUDIO_S32SYS    AUDIO_S32LSB
-#define AUDIO_F32SYS    AUDIO_F32LSB
-#else
-#define AUDIO_U16SYS    AUDIO_U16MSB
-#define AUDIO_S16SYS    AUDIO_S16MSB
-#define AUDIO_S32SYS    AUDIO_S32MSB
-#define AUDIO_F32SYS    AUDIO_F32MSB
-#endif
-/* @} */
-
-/**
- *  \name Allow change flags
- *
- *  Which audio format changes are allowed when opening a device.
- */
-/* @{ */
-#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE    0x00000001
-#define SDL_AUDIO_ALLOW_FORMAT_CHANGE       0x00000002
-#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE     0x00000004
-#define SDL_AUDIO_ALLOW_ANY_CHANGE          (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE)
-/* @} */
-
-/* @} *//* Audio flags */
-
-/**
- *  This function is called when the audio device needs more data.
- *
- *  \param userdata An application-specific parameter saved in
- *                  the SDL_AudioSpec structure
- *  \param stream A pointer to the audio data buffer.
- *  \param len    The length of that buffer in bytes.
- *
- *  Once the callback returns, the buffer will no longer be valid.
- *  Stereo samples are stored in a LRLRLR ordering.
- */
-typedef void (SDLCALL * SDL_AudioCallback) (void *userdata, Uint8 * stream,
-                                            int len);
-
-/**
- *  The calculated values in this structure are calculated by SDL_OpenAudio().
- */
-typedef struct SDL_AudioSpec
-{
-    int freq;                   /**< DSP frequency -- samples per second */
-    SDL_AudioFormat format;     /**< Audio data format */
-    Uint8 channels;             /**< Number of channels: 1 mono, 2 stereo */
-    Uint8 silence;              /**< Audio buffer silence value (calculated) */
-    Uint16 samples;             /**< Audio buffer size in samples (power of 2) */
-    Uint16 padding;             /**< Necessary for some compile environments */
-    Uint32 size;                /**< Audio buffer size in bytes (calculated) */
-    SDL_AudioCallback callback;
-    void *userdata;
-} SDL_AudioSpec;
-
-
-struct SDL_AudioCVT;
-typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt,
-                                          SDL_AudioFormat format);
-
-/**
- *  A structure to hold a set of audio conversion filters and buffers.
- */
-#ifdef __GNUC__
-/* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't
-   pad it out to 88 bytes to guarantee ABI compatibility between compilers.
-   vvv
-   The next time we rev the ABI, make sure to size the ints and add padding.
-*/
-#define SDL_AUDIOCVT_PACKED __attribute__((packed))
-#else
-#define SDL_AUDIOCVT_PACKED
-#endif
-/* */
-typedef struct SDL_AudioCVT
-{
-    int needed;                 /**< Set to 1 if conversion possible */
-    SDL_AudioFormat src_format; /**< Source audio format */
-    SDL_AudioFormat dst_format; /**< Target audio format */
-    double rate_incr;           /**< Rate conversion increment */
-    Uint8 *buf;                 /**< Buffer to hold entire audio data */
-    int len;                    /**< Length of original audio buffer */
-    int len_cvt;                /**< Length of converted audio buffer */
-    int len_mult;               /**< buffer must be len*len_mult big */
-    double len_ratio;           /**< Given len, final size is len*len_ratio */
-    SDL_AudioFilter filters[10];        /**< Filter list */
-    int filter_index;           /**< Current audio conversion function */
-} SDL_AUDIOCVT_PACKED SDL_AudioCVT;
-
-
-/* Function prototypes */
-
-/**
- *  \name Driver discovery functions
- *
- *  These functions return the list of built in audio drivers, in the
- *  order that they are normally initialized by default.
- */
-/* @{ */
-extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void);
-extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index);
-/* @} */
-
-/**
- *  \name Initialization and cleanup
- *
- *  \internal These functions are used internally, and should not be used unless
- *            you have a specific need to specify the audio driver you want to
- *            use.  You should normally use SDL_Init() or SDL_InitSubSystem().
- */
-/* @{ */
-extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
-extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
-/* @} */
-
-/**
- *  This function returns the name of the current audio driver, or NULL
- *  if no driver has been initialized.
- */
-extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void);
-
-/**
- *  This function opens the audio device with the desired parameters, and
- *  returns 0 if successful, placing the actual hardware parameters in the
- *  structure pointed to by \c obtained.  If \c obtained is NULL, the audio
- *  data passed to the callback function will be guaranteed to be in the
- *  requested format, and will be automatically converted to the hardware
- *  audio format if necessary.  This function returns -1 if it failed
- *  to open the audio device, or couldn't set up the audio thread.
- *
- *  When filling in the desired audio spec structure,
- *    - \c desired->freq should be the desired audio frequency in samples-per-
- *      second.
- *    - \c desired->format should be the desired audio format.
- *    - \c desired->samples is the desired size of the audio buffer, in
- *      samples.  This number should be a power of two, and may be adjusted by
- *      the audio driver to a value more suitable for the hardware.  Good values
- *      seem to range between 512 and 8096 inclusive, depending on the
- *      application and CPU speed.  Smaller values yield faster response time,
- *      but can lead to underflow if the application is doing heavy processing
- *      and cannot fill the audio buffer in time.  A stereo sample consists of
- *      both right and left channels in LR ordering.
- *      Note that the number of samples is directly related to time by the
- *      following formula:  \code ms = (samples*1000)/freq \endcode
- *    - \c desired->size is the size in bytes of the audio buffer, and is
- *      calculated by SDL_OpenAudio().
- *    - \c desired->silence is the value used to set the buffer to silence,
- *      and is calculated by SDL_OpenAudio().
- *    - \c desired->callback should be set to a function that will be called
- *      when the audio device is ready for more data.  It is passed a pointer
- *      to the audio buffer, and the length in bytes of the audio buffer.
- *      This function usually runs in a separate thread, and so you should
- *      protect data structures that it accesses by calling SDL_LockAudio()
- *      and SDL_UnlockAudio() in your code.
- *    - \c desired->userdata is passed as the first parameter to your callback
- *      function.
- *
- *  The audio device starts out playing silence when it's opened, and should
- *  be enabled for playing by calling \c SDL_PauseAudio(0) when you are ready
- *  for your audio callback function to be called.  Since the audio driver
- *  may modify the requested size of the audio buffer, you should allocate
- *  any local mixing buffers after you open the audio device.
- */
-extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired,
-                                          SDL_AudioSpec * obtained);
-
-/**
- *  SDL Audio Device IDs.
- *
- *  A successful call to SDL_OpenAudio() is always device id 1, and legacy
- *  SDL audio APIs assume you want this device ID. SDL_OpenAudioDevice() calls
- *  always returns devices >= 2 on success. The legacy calls are good both
- *  for backwards compatibility and when you don't care about multiple,
- *  specific, or capture devices.
- */
-typedef Uint32 SDL_AudioDeviceID;
-
-/**
- *  Get the number of available devices exposed by the current driver.
- *  Only valid after a successfully initializing the audio subsystem.
- *  Returns -1 if an explicit list of devices can't be determined; this is
- *  not an error. For example, if SDL is set up to talk to a remote audio
- *  server, it can't list every one available on the Internet, but it will
- *  still allow a specific host to be specified to SDL_OpenAudioDevice().
- *
- *  In many common cases, when this function returns a value <= 0, it can still
- *  successfully open the default device (NULL for first argument of
- *  SDL_OpenAudioDevice()).
- */
-extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture);
-
-/**
- *  Get the human-readable name of a specific audio device.
- *  Must be a value between 0 and (number of audio devices-1).
- *  Only valid after a successfully initializing the audio subsystem.
- *  The values returned by this function reflect the latest call to
- *  SDL_GetNumAudioDevices(); recall that function to redetect available
- *  hardware.
- *
- *  The string returned by this function is UTF-8 encoded, read-only, and
- *  managed internally. You are not to free it. If you need to keep the
- *  string for any length of time, you should make your own copy of it, as it
- *  will be invalid next time any of several other SDL functions is called.
- */
-extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index,
-                                                           int iscapture);
-
-
-/**
- *  Open a specific audio device. Passing in a device name of NULL requests
- *  the most reasonable default (and is equivalent to calling SDL_OpenAudio()).
- *
- *  The device name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but
- *  some drivers allow arbitrary and driver-specific strings, such as a
- *  hostname/IP address for a remote audio server, or a filename in the
- *  diskaudio driver.
- *
- *  \return 0 on error, a valid device ID that is >= 2 on success.
- *
- *  SDL_OpenAudio(), unlike this function, always acts on device ID 1.
- */
-extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char
-                                                              *device,
-                                                              int iscapture,
-                                                              const
-                                                              SDL_AudioSpec *
-                                                              desired,
-                                                              SDL_AudioSpec *
-                                                              obtained,
-                                                              int
-                                                              allowed_changes);
-
-
-
-/**
- *  \name Audio state
- *
- *  Get the current audio state.
- */
-/* @{ */
-typedef enum
-{
-    SDL_AUDIO_STOPPED = 0,
-    SDL_AUDIO_PLAYING,
-    SDL_AUDIO_PAUSED
-} SDL_AudioStatus;
-extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void);
-
-extern DECLSPEC SDL_AudioStatus SDLCALL
-SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
-/* @} *//* Audio State */
-
-/**
- *  \name Pause audio functions
- *
- *  These functions pause and unpause the audio callback processing.
- *  They should be called with a parameter of 0 after opening the audio
- *  device to start playing sound.  This is so you can safely initialize
- *  data for your callback function after opening the audio device.
- *  Silence will be written to the audio device during the pause.
- */
-/* @{ */
-extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
-extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev,
-                                                  int pause_on);
-/* @} *//* Pause audio functions */
-
-/**
- *  This function loads a WAVE from the data source, automatically freeing
- *  that source if \c freesrc is non-zero.  For example, to load a WAVE file,
- *  you could do:
- *  \code
- *      SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
- *  \endcode
- *
- *  If this function succeeds, it returns the given SDL_AudioSpec,
- *  filled with the audio data format of the wave data, and sets
- *  \c *audio_buf to a malloc()'d buffer containing the audio data,
- *  and sets \c *audio_len to the length of that audio buffer, in bytes.
- *  You need to free the audio buffer with SDL_FreeWAV() when you are
- *  done with it.
- *
- *  This function returns NULL and sets the SDL error message if the
- *  wave file cannot be opened, uses an unknown data format, or is
- *  corrupt.  Currently raw and MS-ADPCM WAVE files are supported.
- */
-extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src,
-                                                      int freesrc,
-                                                      SDL_AudioSpec * spec,
-                                                      Uint8 ** audio_buf,
-                                                      Uint32 * audio_len);
-
-/**
- *  Loads a WAV from a file.
- *  Compatibility convenience function.
- */
-#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \
-    SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)
-
-/**
- *  This function frees data previously allocated with SDL_LoadWAV_RW()
- */
-extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 * audio_buf);
-
-/**
- *  This function takes a source format and rate and a destination format
- *  and rate, and initializes the \c cvt structure with information needed
- *  by SDL_ConvertAudio() to convert a buffer of audio data from one format
- *  to the other.
- *
- *  \return -1 if the format conversion is not supported, 0 if there's
- *  no conversion needed, or 1 if the audio filter is set up.
- */
-extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
-                                              SDL_AudioFormat src_format,
-                                              Uint8 src_channels,
-                                              int src_rate,
-                                              SDL_AudioFormat dst_format,
-                                              Uint8 dst_channels,
-                                              int dst_rate);
-
-/**
- *  Once you have initialized the \c cvt structure using SDL_BuildAudioCVT(),
- *  created an audio buffer \c cvt->buf, and filled it with \c cvt->len bytes of
- *  audio data in the source format, this function will convert it in-place
- *  to the desired format.
- *
- *  The data conversion may expand the size of the audio data, so the buffer
- *  \c cvt->buf should be allocated after the \c cvt structure is initialized by
- *  SDL_BuildAudioCVT(), and should be \c cvt->len*cvt->len_mult bytes long.
- */
-extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT * cvt);
-
-#define SDL_MIX_MAXVOLUME 128
-/**
- *  This takes two audio buffers of the playing audio format and mixes
- *  them, performing addition, volume adjustment, and overflow clipping.
- *  The volume ranges from 0 - 128, and should be set to ::SDL_MIX_MAXVOLUME
- *  for full audio volume.  Note this does not change hardware volume.
- *  This is provided for convenience -- you can mix your own audio data.
- */
-extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 * dst, const Uint8 * src,
-                                          Uint32 len, int volume);
-
-/**
- *  This works like SDL_MixAudio(), but you specify the audio format instead of
- *  using the format of audio device 1. Thus it can be used when no audio
- *  device is open at all.
- */
-extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst,
-                                                const Uint8 * src,
-                                                SDL_AudioFormat format,
-                                                Uint32 len, int volume);
-
-/**
- *  \name Audio lock functions
- *
- *  The lock manipulated by these functions protects the callback function.
- *  During a SDL_LockAudio()/SDL_UnlockAudio() pair, you can be guaranteed that
- *  the callback function is not running.  Do not call these from the callback
- *  function or you will cause deadlock.
- */
-/* @{ */
-extern DECLSPEC void SDLCALL SDL_LockAudio(void);
-extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev);
-extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
-extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev);
-/* @} *//* Audio lock functions */
-
-/**
- *  This function shuts down audio processing and closes the audio device.
- */
-extern DECLSPEC void SDLCALL SDL_CloseAudio(void);
-extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_audio_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_bits.h b/linux-x86/include/SDL2/SDL_bits.h
deleted file mode 100644
index 341524f..0000000
--- a/linux-x86/include/SDL2/SDL_bits.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_bits.h
- *
- *  Functions for fiddling with bits and bitmasks.
- */
-
-#ifndef _SDL_bits_h
-#define _SDL_bits_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \file SDL_bits.h
- */
-
-/**
- *  Get the index of the most significant bit. Result is undefined when called
- *  with 0. This operation can also be stated as "count leading zeroes" and
- *  "log base 2".
- *
- *  \return Index of the most significant bit, or -1 if the value is 0.
- */
-SDL_FORCE_INLINE int
-SDL_MostSignificantBitIndex32(Uint32 x)
-{
-#if defined(__GNUC__) && __GNUC__ >= 4
-    /* Count Leading Zeroes builtin in GCC.
-     * http://gcc.gnu.org/onlinedocs/gcc-4.3.4/gcc/Other-Builtins.html
-     */
-    if (x == 0) {
-        return -1;
-    }
-    return 31 - __builtin_clz(x);
-#else
-    /* Based off of Bit Twiddling Hacks by Sean Eron Anderson
-     * <seander@cs.stanford.edu>, released in the public domain.
-     * http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog
-     */
-    const Uint32 b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000};
-    const int    S[] = {1, 2, 4, 8, 16};
-
-    int msbIndex = 0;
-    int i;
-
-    if (x == 0) {
-        return -1;
-    }
-
-    for (i = 4; i >= 0; i--)
-    {
-        if (x & b[i])
-        {
-            x >>= S[i];
-            msbIndex |= S[i];
-        }
-    }
-
-    return msbIndex;
-#endif
-}
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_bits_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_blendmode.h b/linux-x86/include/SDL2/SDL_blendmode.h
deleted file mode 100644
index 8c257be..0000000
--- a/linux-x86/include/SDL2/SDL_blendmode.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_blendmode.h
- *
- *  Header file declaring the SDL_BlendMode enumeration
- */
-
-#ifndef _SDL_blendmode_h
-#define _SDL_blendmode_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \brief The blend mode used in SDL_RenderCopy() and drawing operations.
- */
-typedef enum
-{
-    SDL_BLENDMODE_NONE = 0x00000000,     /**< no blending
-                                              dstRGBA = srcRGBA */
-    SDL_BLENDMODE_BLEND = 0x00000001,    /**< alpha blending
-                                              dstRGB = (srcRGB * srcA) + (dstRGB * (1-srcA))
-                                              dstA = srcA + (dstA * (1-srcA)) */
-    SDL_BLENDMODE_ADD = 0x00000002,      /**< additive blending
-                                              dstRGB = (srcRGB * srcA) + dstRGB
-                                              dstA = dstA */
-    SDL_BLENDMODE_MOD = 0x00000004       /**< color modulate
-                                              dstRGB = srcRGB * dstRGB
-                                              dstA = dstA */
-} SDL_BlendMode;
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_video_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_clipboard.h b/linux-x86/include/SDL2/SDL_clipboard.h
deleted file mode 100644
index 74e2b32..0000000
--- a/linux-x86/include/SDL2/SDL_clipboard.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- * \file SDL_clipboard.h
- *
- * Include file for SDL clipboard handling
- */
-
-#ifndef _SDL_clipboard_h
-#define _SDL_clipboard_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Function prototypes */
-
-/**
- * \brief Put UTF-8 text into the clipboard
- *
- * \sa SDL_GetClipboardText()
- */
-extern DECLSPEC int SDLCALL SDL_SetClipboardText(const char *text);
-
-/**
- * \brief Get UTF-8 text from the clipboard, which must be freed with SDL_free()
- *
- * \sa SDL_SetClipboardText()
- */
-extern DECLSPEC char * SDLCALL SDL_GetClipboardText(void);
-
-/**
- * \brief Returns a flag indicating whether the clipboard exists and contains a text string that is non-empty
- *
- * \sa SDL_GetClipboardText()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_clipboard_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_config.h b/linux-x86/include/SDL2/SDL_config.h
deleted file mode 100644
index 109219c..0000000
--- a/linux-x86/include/SDL2/SDL_config.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/* include/SDL_config.h.  Generated from SDL_config.h.in by configure.  */
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-/**
- *  \file SDL_config.h.in
- *
- *  This is a set of defines to configure the SDL features
- */
-
-/* General platform specific identifiers */
-#include "SDL_platform.h"
-
-/* Make sure that this isn't included by Visual C++ */
-#ifdef _MSC_VER
-#error You should run hg revert SDL_config.h 
-#endif
-
-/* C language features */
-/* #undef const */
-/* #undef inline */
-/* #undef volatile */
-
-/* C datatypes */
-#ifdef __LP64__
-#define SIZEOF_VOIDP 8
-#else
-#define SIZEOF_VOIDP 4
-#endif
-#define HAVE_GCC_ATOMICS 1
-/* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
-#define HAVE_PTHREAD_SPINLOCK 1
-
-/* Comment this if you want to build without any C library requirements */
-#define HAVE_LIBC 1
-#if HAVE_LIBC
-
-/* Useful headers */
-#define HAVE_ALLOCA_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_ICONV_H 1
-#define HAVE_SIGNAL_H 1
-/* #undef HAVE_ALTIVEC_H */
-/* #undef HAVE_PTHREAD_NP_H */
-/* #undef HAVE_LIBUDEV_H */
-/* #undef HAVE_DBUS_DBUS_H */
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
-#define HAVE_GETENV 1
-#define HAVE_SETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#endif
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-/* #undef HAVE_STRLCPY */
-/* #undef HAVE_STRLCAT */
-#define HAVE_STRDUP 1
-/* #undef HAVE__STRREV */
-/* #undef HAVE__STRUPR */
-/* #undef HAVE__STRLWR */
-/* #undef HAVE_INDEX */
-/* #undef HAVE_RINDEX */
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-/* #undef HAVE_ITOA */
-/* #undef HAVE__LTOA */
-/* #undef HAVE__UITOA */
-/* #undef HAVE__ULTOA */
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-/* #undef HAVE__I64TOA */
-/* #undef HAVE__UI64TOA */
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOULL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-/* #undef HAVE__STRICMP */
-#define HAVE_STRCASECMP 1
-/* #undef HAVE__STRNICMP */
-#define HAVE_STRNCASECMP 1
-/* #undef HAVE_SSCANF */
-#define HAVE_VSSCANF 1
-/* #undef HAVE_SNPRINTF */
-#define HAVE_VSNPRINTF 1
-#define HAVE_M_PI /**/
-#define HAVE_ATAN 1
-#define HAVE_ATAN2 1
-#define HAVE_ACOS 1
-#define HAVE_ASIN 1
-#define HAVE_CEIL 1
-#define HAVE_COPYSIGN 1
-#define HAVE_COS 1
-#define HAVE_COSF 1
-#define HAVE_FABS 1
-#define HAVE_FLOOR 1
-#define HAVE_LOG 1
-#define HAVE_POW 1
-#define HAVE_SCALBN 1
-#define HAVE_SIN 1
-#define HAVE_SINF 1
-#define HAVE_SQRT 1
-#define HAVE_FSEEKO 1
-#define HAVE_FSEEKO64 1
-#define HAVE_SIGACTION 1
-#define HAVE_SA_SIGACTION 1
-#define HAVE_SETJMP 1
-#define HAVE_NANOSLEEP 1
-#define HAVE_SYSCONF 1
-/* #undef HAVE_SYSCTLBYNAME */
-#define HAVE_CLOCK_GETTIME 1
-/* #undef HAVE_GETPAGESIZE */
-#define HAVE_MPROTECT 1
-#define HAVE_ICONV 1
-/* #undef HAVE_PTHREAD_SETNAME_NP */
-/* #undef HAVE_PTHREAD_SET_NAME_NP */
-#define HAVE_SEM_TIMEDWAIT 1
-
-#else
-#define HAVE_STDARG_H 1
-#define HAVE_STDDEF_H 1
-#define HAVE_STDINT_H 1
-#endif /* HAVE_LIBC */
-
-/* SDL internal assertion support */
-/* #undef SDL_DEFAULT_ASSERT_LEVEL */
-
-/* Allow disabling of core subsystems */
-/* #undef SDL_ATOMIC_DISABLED */
-/* #undef SDL_AUDIO_DISABLED */
-/* #undef SDL_CPUINFO_DISABLED */
-/* #undef SDL_EVENTS_DISABLED */
-/* #undef SDL_FILE_DISABLED */
-/* #undef SDL_JOYSTICK_DISABLED */
-/* #undef SDL_HAPTIC_DISABLED */
-/* #undef SDL_LOADSO_DISABLED */
-/* #undef SDL_RENDER_DISABLED */
-/* #undef SDL_THREADS_DISABLED */
-/* #undef SDL_TIMERS_DISABLED */
-/* #undef SDL_VIDEO_DISABLED */
-/* #undef SDL_POWER_DISABLED */
-/* #undef SDL_FILESYSTEM_DISABLED */
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_ALSA 1
-#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
-/* #undef SDL_AUDIO_DRIVER_ARTS */
-/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO */
-/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_HAIKU */
-/* #undef SDL_AUDIO_DRIVER_BSD */
-/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
-#define SDL_AUDIO_DRIVER_DISK 1
-#define SDL_AUDIO_DRIVER_DUMMY 1
-/* #undef SDL_AUDIO_DRIVER_XAUDIO2 */
-/* #undef SDL_AUDIO_DRIVER_DSOUND */
-/* #undef SDL_AUDIO_DRIVER_ESD */
-/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_NAS */
-/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_SNDIO */
-/* #undef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC */
-#define SDL_AUDIO_DRIVER_OSS 1
-/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
-/* #undef SDL_AUDIO_DRIVER_PAUDIO */
-/* #undef SDL_AUDIO_DRIVER_QSA */
-/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
-/* #undef SDL_AUDIO_DRIVER_WINMM */
-/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
-/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
-
-/* Enable various input drivers */
-#define SDL_INPUT_LINUXEV 1
-#define SDL_INPUT_LINUXKD 1
-/* #undef SDL_INPUT_TSLIB */
-/* #undef SDL_JOYSTICK_HAIKU */
-/* #undef SDL_JOYSTICK_DINPUT */
-/* #undef SDL_JOYSTICK_DUMMY */
-/* #undef SDL_JOYSTICK_IOKIT */
-#define SDL_JOYSTICK_LINUX 1
-/* #undef SDL_JOYSTICK_WINMM */
-/* #undef SDL_JOYSTICK_USBHID */
-/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
-/* #undef SDL_HAPTIC_DUMMY */
-#define SDL_HAPTIC_LINUX 1
-/* #undef SDL_HAPTIC_IOKIT */
-/* #undef SDL_HAPTIC_DINPUT */
-
-/* Enable various shared object loading systems */
-/* #undef SDL_LOADSO_HAIKU */
-#define SDL_LOADSO_DLOPEN 1
-/* #undef SDL_LOADSO_DUMMY */
-/* #undef SDL_LOADSO_LDG */
-/* #undef SDL_LOADSO_WINDOWS */
-
-/* Enable various threading systems */
-#define SDL_THREAD_PTHREAD 1
-/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX */
-#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1
-/* #undef SDL_THREAD_WINDOWS */
-
-/* Enable various timer systems */
-/* #undef SDL_TIMER_HAIKU */
-/* #undef SDL_TIMER_DUMMY */
-#define SDL_TIMER_UNIX 1
-/* #undef SDL_TIMER_WINDOWS */
-
-/* Enable various video drivers */
-/* #undef SDL_VIDEO_DRIVER_HAIKU */
-/* #undef SDL_VIDEO_DRIVER_COCOA */
-/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
-/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
-#define SDL_VIDEO_DRIVER_DUMMY 1
-/* #undef SDL_VIDEO_DRIVER_WINDOWS */
-/* #undef SDL_VIDEO_DRIVER_WAYLAND */
-/* #undef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
-/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */
-/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL */
-/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR */
-/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON */
-/* #undef SDL_VIDEO_DRIVER_MIR */
-/* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC */
-/* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON */
-#define SDL_VIDEO_DRIVER_X11 1
-/* #undef SDL_VIDEO_DRIVER_RPI */
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE */
-/* #undef SDL_VIDEO_DRIVER_X11_XCURSOR */
-/* #undef SDL_VIDEO_DRIVER_X11_XINERAMA */
-/* #undef SDL_VIDEO_DRIVER_X11_XINPUT2 */
-/* #undef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH */
-/* #undef SDL_VIDEO_DRIVER_X11_XRANDR */
-/* #undef SDL_VIDEO_DRIVER_X11_XSCRNSAVER */
-#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
-/* #undef SDL_VIDEO_DRIVER_X11_XVIDMODE */
-#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
-#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1
-/* #undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY */
-#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
-
-/* #undef SDL_VIDEO_RENDER_D3D */
-/* #undef SDL_VIDEO_RENDER_D3D11 */
-#define SDL_VIDEO_RENDER_OGL 1
-/* #undef SDL_VIDEO_RENDER_OGL_ES */
-/* #undef SDL_VIDEO_RENDER_OGL_ES2 */
-/* #undef SDL_VIDEO_RENDER_DIRECTFB */
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL 1
-/* #undef SDL_VIDEO_OPENGL_ES */
-/* #undef SDL_VIDEO_OPENGL_ES2 */
-/* #undef SDL_VIDEO_OPENGL_BGL */
-/* #undef SDL_VIDEO_OPENGL_CGL */
-/* #undef SDL_VIDEO_OPENGL_EGL */
-#define SDL_VIDEO_OPENGL_GLX 1
-/* #undef SDL_VIDEO_OPENGL_WGL */
-/* #undef SDL_VIDEO_OPENGL_OSMESA */
-/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
-
-/* Enable system power support */
-#define SDL_POWER_LINUX 1
-/* #undef SDL_POWER_WINDOWS */
-/* #undef SDL_POWER_MACOSX */
-/* #undef SDL_POWER_HAIKU */
-/* #undef SDL_POWER_HARDWIRED */
-
-/* Enable system filesystem support */
-/* #undef SDL_FILESYSTEM_HAIKU */
-/* #undef SDL_FILESYSTEM_COCOA */
-/* #undef SDL_FILESYSTEM_DUMMY */
-#define SDL_FILESYSTEM_UNIX 1
-/* #undef SDL_FILESYSTEM_WINDOWS */
-
-/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES 1
-/* #undef SDL_ALTIVEC_BLITTERS */
-
-#endif /* _SDL_config_h */
diff --git a/linux-x86/include/SDL2/SDL_cpuinfo.h b/linux-x86/include/SDL2/SDL_cpuinfo.h
deleted file mode 100644
index 1f6efd3..0000000
--- a/linux-x86/include/SDL2/SDL_cpuinfo.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_cpuinfo.h
- *
- *  CPU feature detection for SDL.
- */
-
-#ifndef _SDL_cpuinfo_h
-#define _SDL_cpuinfo_h
-
-#include "SDL_stdinc.h"
-
-/* Need to do this here because intrin.h has C++ code in it */
-/* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */
-#if defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_IX86) || defined(_M_X64))
-#include <intrin.h>
-#ifndef _WIN64
-#define __MMX__
-#define __3dNOW__
-#endif
-#define __SSE__
-#define __SSE2__
-#elif defined(__MINGW64_VERSION_MAJOR)
-#include <intrin.h>
-#else
-#ifdef __ALTIVEC__
-#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__)
-#include <altivec.h>
-#undef pixel
-#endif
-#endif
-#ifdef __MMX__
-#include <mmintrin.h>
-#endif
-#ifdef __3dNOW__
-#include <mm3dnow.h>
-#endif
-#ifdef __SSE__
-#include <xmmintrin.h>
-#endif
-#ifdef __SSE2__
-#include <emmintrin.h>
-#endif
-#endif
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is a guess for the cacheline size used for padding.
- * Most x86 processors have a 64 byte cache line.
- * The 64-bit PowerPC processors have a 128 byte cache line.
- * We'll use the larger value to be generally safe.
- */
-#define SDL_CACHELINE_SIZE  128
-
-/**
- *  This function returns the number of CPU cores available.
- */
-extern DECLSPEC int SDLCALL SDL_GetCPUCount(void);
-
-/**
- *  This function returns the L1 cache line size of the CPU
- *
- *  This is useful for determining multi-threaded structure padding
- *  or SIMD prefetch sizes.
- */
-extern DECLSPEC int SDLCALL SDL_GetCPUCacheLineSize(void);
-
-/**
- *  This function returns true if the CPU has the RDTSC instruction.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void);
-
-/**
- *  This function returns true if the CPU has AltiVec features.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
-
-/**
- *  This function returns true if the CPU has MMX features.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
-
-/**
- *  This function returns true if the CPU has 3DNow! features.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
-
-/**
- *  This function returns true if the CPU has SSE features.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
-
-/**
- *  This function returns true if the CPU has SSE2 features.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
-
-/**
- *  This function returns true if the CPU has SSE3 features.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE3(void);
-
-/**
- *  This function returns true if the CPU has SSE4.1 features.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE41(void);
-
-/**
- *  This function returns true if the CPU has SSE4.2 features.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE42(void);
-
-/**
- *  This function returns true if the CPU has AVX features.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void);
-
-/**
- *  This function returns the amount of RAM configured in the system, in MB.
- */
-extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_cpuinfo_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_endian.h b/linux-x86/include/SDL2/SDL_endian.h
deleted file mode 100644
index 161c418..0000000
--- a/linux-x86/include/SDL2/SDL_endian.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_endian.h
- *
- *  Functions for reading and writing endian-specific values
- */
-
-#ifndef _SDL_endian_h
-#define _SDL_endian_h
-
-#include "SDL_stdinc.h"
-
-/**
- *  \name The two types of endianness
- */
-/* @{ */
-#define SDL_LIL_ENDIAN  1234
-#define SDL_BIG_ENDIAN  4321
-/* @} */
-
-#ifndef SDL_BYTEORDER           /* Not defined in SDL_config.h? */
-#ifdef __linux__
-#include <endian.h>
-#define SDL_BYTEORDER  __BYTE_ORDER
-#else /* __linux __ */
-#if defined(__hppa__) || \
-    defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
-    (defined(__MIPS__) && defined(__MISPEB__)) || \
-    defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
-    defined(__sparc__)
-#define SDL_BYTEORDER   SDL_BIG_ENDIAN
-#else
-#define SDL_BYTEORDER   SDL_LIL_ENDIAN
-#endif
-#endif /* __linux __ */
-#endif /* !SDL_BYTEORDER */
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \file SDL_endian.h
- */
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
-SDL_FORCE_INLINE Uint16
-SDL_Swap16(Uint16 x)
-{
-  __asm__("xchgb %b0,%h0": "=q"(x):"0"(x));
-    return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-SDL_FORCE_INLINE Uint16
-SDL_Swap16(Uint16 x)
-{
-  __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x));
-    return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-SDL_FORCE_INLINE Uint16
-SDL_Swap16(Uint16 x)
-{
-    int result;
-
-  __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
-    return (Uint16)result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
-SDL_FORCE_INLINE Uint16
-SDL_Swap16(Uint16 x)
-{
-  __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc");
-    return x;
-}
-#else
-SDL_FORCE_INLINE Uint16
-SDL_Swap16(Uint16 x)
-{
-    return SDL_static_cast(Uint16, ((x << 8) | (x >> 8)));
-}
-#endif
-
-#if defined(__GNUC__) && defined(__i386__)
-SDL_FORCE_INLINE Uint32
-SDL_Swap32(Uint32 x)
-{
-  __asm__("bswap %0": "=r"(x):"0"(x));
-    return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-SDL_FORCE_INLINE Uint32
-SDL_Swap32(Uint32 x)
-{
-  __asm__("bswapl %0": "=r"(x):"0"(x));
-    return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-SDL_FORCE_INLINE Uint32
-SDL_Swap32(Uint32 x)
-{
-    Uint32 result;
-
-  __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x));
-  __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x));
-  __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
-    return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
-SDL_FORCE_INLINE Uint32
-SDL_Swap32(Uint32 x)
-{
-  __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d"(x): "0"(x):"cc");
-    return x;
-}
-#else
-SDL_FORCE_INLINE Uint32
-SDL_Swap32(Uint32 x)
-{
-    return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) |
-                                    ((x >> 8) & 0x0000FF00) | (x >> 24)));
-}
-#endif
-
-#if defined(__GNUC__) && defined(__i386__)
-SDL_FORCE_INLINE Uint64
-SDL_Swap64(Uint64 x)
-{
-    union
-    {
-        struct
-        {
-            Uint32 a, b;
-        } s;
-        Uint64 u;
-    } v;
-    v.u = x;
-  __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
-            "1"(v.s.
-                b));
-    return v.u;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-SDL_FORCE_INLINE Uint64
-SDL_Swap64(Uint64 x)
-{
-  __asm__("bswapq %0": "=r"(x):"0"(x));
-    return x;
-}
-#else
-SDL_FORCE_INLINE Uint64
-SDL_Swap64(Uint64 x)
-{
-    Uint32 hi, lo;
-
-    /* Separate into high and low 32-bit values and swap them */
-    lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
-    x >>= 32;
-    hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
-    x = SDL_Swap32(lo);
-    x <<= 32;
-    x |= SDL_Swap32(hi);
-    return (x);
-}
-#endif
-
-
-SDL_FORCE_INLINE float
-SDL_SwapFloat(float x)
-{
-    union
-    {
-        float f;
-        Uint32 ui32;
-    } swapper;
-    swapper.f = x;
-    swapper.ui32 = SDL_Swap32(swapper.ui32);
-    return swapper.f;
-}
-
-
-/**
- *  \name Swap to native
- *  Byteswap item from the specified endianness to the native endianness.
- */
-/* @{ */
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define SDL_SwapLE16(X) (X)
-#define SDL_SwapLE32(X) (X)
-#define SDL_SwapLE64(X) (X)
-#define SDL_SwapFloatLE(X)  (X)
-#define SDL_SwapBE16(X) SDL_Swap16(X)
-#define SDL_SwapBE32(X) SDL_Swap32(X)
-#define SDL_SwapBE64(X) SDL_Swap64(X)
-#define SDL_SwapFloatBE(X)  SDL_SwapFloat(X)
-#else
-#define SDL_SwapLE16(X) SDL_Swap16(X)
-#define SDL_SwapLE32(X) SDL_Swap32(X)
-#define SDL_SwapLE64(X) SDL_Swap64(X)
-#define SDL_SwapFloatLE(X)  SDL_SwapFloat(X)
-#define SDL_SwapBE16(X) (X)
-#define SDL_SwapBE32(X) (X)
-#define SDL_SwapBE64(X) (X)
-#define SDL_SwapFloatBE(X)  (X)
-#endif
-/* @} *//* Swap to native */
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_endian_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_error.h b/linux-x86/include/SDL2/SDL_error.h
deleted file mode 100644
index 5776cfa..0000000
--- a/linux-x86/include/SDL2/SDL_error.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_error.h
- *
- *  Simple error message routines for SDL.
- */
-
-#ifndef _SDL_error_h
-#define _SDL_error_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Public functions */
-/* SDL_SetError() unconditionally returns -1. */
-extern DECLSPEC int SDLCALL SDL_SetError(const char *fmt, ...);
-extern DECLSPEC const char *SDLCALL SDL_GetError(void);
-extern DECLSPEC void SDLCALL SDL_ClearError(void);
-
-/**
- *  \name Internal error functions
- *
- *  \internal
- *  Private error reporting function - used internally.
- */
-/* @{ */
-#define SDL_OutOfMemory()   SDL_Error(SDL_ENOMEM)
-#define SDL_Unsupported()   SDL_Error(SDL_UNSUPPORTED)
-#define SDL_InvalidParamError(param)    SDL_SetError("Parameter '%s' is invalid", (param))
-typedef enum
-{
-    SDL_ENOMEM,
-    SDL_EFREAD,
-    SDL_EFWRITE,
-    SDL_EFSEEK,
-    SDL_UNSUPPORTED,
-    SDL_LASTERROR
-} SDL_errorcode;
-/* SDL_Error() unconditionally returns -1. */
-extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
-/* @} *//* Internal error functions */
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_error_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_events.h b/linux-x86/include/SDL2/SDL_events.h
deleted file mode 100644
index fc5a145..0000000
--- a/linux-x86/include/SDL2/SDL_events.h
+++ /dev/null
@@ -1,723 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_events.h
- *
- *  Include file for SDL event handling.
- */
-
-#ifndef _SDL_events_h
-#define _SDL_events_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-#include "SDL_keyboard.h"
-#include "SDL_mouse.h"
-#include "SDL_joystick.h"
-#include "SDL_gamecontroller.h"
-#include "SDL_quit.h"
-#include "SDL_gesture.h"
-#include "SDL_touch.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* General keyboard/mouse state definitions */
-#define SDL_RELEASED    0
-#define SDL_PRESSED 1
-
-/**
- * \brief The types of events that can be delivered.
- */
-typedef enum
-{
-    SDL_FIRSTEVENT     = 0,     /**< Unused (do not remove) */
-
-    /* Application events */
-    SDL_QUIT           = 0x100, /**< User-requested quit */
-
-    /* These application events have special meaning on iOS, see README-ios.txt for details */
-    SDL_APP_TERMINATING,        /**< The application is being terminated by the OS
-                                     Called on iOS in applicationWillTerminate()
-                                     Called on Android in onDestroy()
-                                */
-    SDL_APP_LOWMEMORY,          /**< The application is low on memory, free memory if possible.
-                                     Called on iOS in applicationDidReceiveMemoryWarning()
-                                     Called on Android in onLowMemory()
-                                */
-    SDL_APP_WILLENTERBACKGROUND, /**< The application is about to enter the background
-                                     Called on iOS in applicationWillResignActive()
-                                     Called on Android in onPause()
-                                */
-    SDL_APP_DIDENTERBACKGROUND, /**< The application did enter the background and may not get CPU for some time
-                                     Called on iOS in applicationDidEnterBackground()
-                                     Called on Android in onPause()
-                                */
-    SDL_APP_WILLENTERFOREGROUND, /**< The application is about to enter the foreground
-                                     Called on iOS in applicationWillEnterForeground()
-                                     Called on Android in onResume()
-                                */
-    SDL_APP_DIDENTERFOREGROUND, /**< The application is now interactive
-                                     Called on iOS in applicationDidBecomeActive()
-                                     Called on Android in onResume()
-                                */
-
-    /* Window events */
-    SDL_WINDOWEVENT    = 0x200, /**< Window state change */
-    SDL_SYSWMEVENT,             /**< System specific event */
-
-    /* Keyboard events */
-    SDL_KEYDOWN        = 0x300, /**< Key pressed */
-    SDL_KEYUP,                  /**< Key released */
-    SDL_TEXTEDITING,            /**< Keyboard text editing (composition) */
-    SDL_TEXTINPUT,              /**< Keyboard text input */
-
-    /* Mouse events */
-    SDL_MOUSEMOTION    = 0x400, /**< Mouse moved */
-    SDL_MOUSEBUTTONDOWN,        /**< Mouse button pressed */
-    SDL_MOUSEBUTTONUP,          /**< Mouse button released */
-    SDL_MOUSEWHEEL,             /**< Mouse wheel motion */
-
-    /* Joystick events */
-    SDL_JOYAXISMOTION  = 0x600, /**< Joystick axis motion */
-    SDL_JOYBALLMOTION,          /**< Joystick trackball motion */
-    SDL_JOYHATMOTION,           /**< Joystick hat position change */
-    SDL_JOYBUTTONDOWN,          /**< Joystick button pressed */
-    SDL_JOYBUTTONUP,            /**< Joystick button released */
-    SDL_JOYDEVICEADDED,         /**< A new joystick has been inserted into the system */
-    SDL_JOYDEVICEREMOVED,       /**< An opened joystick has been removed */
-
-    /* Game controller events */
-    SDL_CONTROLLERAXISMOTION  = 0x650, /**< Game controller axis motion */
-    SDL_CONTROLLERBUTTONDOWN,          /**< Game controller button pressed */
-    SDL_CONTROLLERBUTTONUP,            /**< Game controller button released */
-    SDL_CONTROLLERDEVICEADDED,         /**< A new Game controller has been inserted into the system */
-    SDL_CONTROLLERDEVICEREMOVED,       /**< An opened Game controller has been removed */
-    SDL_CONTROLLERDEVICEREMAPPED,      /**< The controller mapping was updated */
-
-    /* Touch events */
-    SDL_FINGERDOWN      = 0x700,
-    SDL_FINGERUP,
-    SDL_FINGERMOTION,
-
-    /* Gesture events */
-    SDL_DOLLARGESTURE   = 0x800,
-    SDL_DOLLARRECORD,
-    SDL_MULTIGESTURE,
-
-    /* Clipboard events */
-    SDL_CLIPBOARDUPDATE = 0x900, /**< The clipboard changed */
-
-    /* Drag and drop events */
-    SDL_DROPFILE        = 0x1000, /**< The system requests a file open */
-
-    /* Render events */
-    SDL_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset */
-
-    /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use,
-     *  and should be allocated with SDL_RegisterEvents()
-     */
-    SDL_USEREVENT    = 0x8000,
-
-    /**
-     *  This last event is only for bounding internal arrays
-     */
-    SDL_LASTEVENT    = 0xFFFF
-} SDL_EventType;
-
-/**
- *  \brief Fields shared by every event
- */
-typedef struct SDL_CommonEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-} SDL_CommonEvent;
-
-/**
- *  \brief Window state change event data (event.window.*)
- */
-typedef struct SDL_WindowEvent
-{
-    Uint32 type;        /**< ::SDL_WINDOWEVENT */
-    Uint32 timestamp;
-    Uint32 windowID;    /**< The associated window */
-    Uint8 event;        /**< ::SDL_WindowEventID */
-    Uint8 padding1;
-    Uint8 padding2;
-    Uint8 padding3;
-    Sint32 data1;       /**< event dependent data */
-    Sint32 data2;       /**< event dependent data */
-} SDL_WindowEvent;
-
-/**
- *  \brief Keyboard button event structure (event.key.*)
- */
-typedef struct SDL_KeyboardEvent
-{
-    Uint32 type;        /**< ::SDL_KEYDOWN or ::SDL_KEYUP */
-    Uint32 timestamp;
-    Uint32 windowID;    /**< The window with keyboard focus, if any */
-    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
-    Uint8 repeat;       /**< Non-zero if this is a key repeat */
-    Uint8 padding2;
-    Uint8 padding3;
-    SDL_Keysym keysym;  /**< The key that was pressed or released */
-} SDL_KeyboardEvent;
-
-#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32)
-/**
- *  \brief Keyboard text editing event structure (event.edit.*)
- */
-typedef struct SDL_TextEditingEvent
-{
-    Uint32 type;                                /**< ::SDL_TEXTEDITING */
-    Uint32 timestamp;
-    Uint32 windowID;                            /**< The window with keyboard focus, if any */
-    char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
-    Sint32 start;                               /**< The start cursor of selected editing text */
-    Sint32 length;                              /**< The length of selected editing text */
-} SDL_TextEditingEvent;
-
-
-#define SDL_TEXTINPUTEVENT_TEXT_SIZE (32)
-/**
- *  \brief Keyboard text input event structure (event.text.*)
- */
-typedef struct SDL_TextInputEvent
-{
-    Uint32 type;                              /**< ::SDL_TEXTINPUT */
-    Uint32 timestamp;
-    Uint32 windowID;                          /**< The window with keyboard focus, if any */
-    char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];  /**< The input text */
-} SDL_TextInputEvent;
-
-/**
- *  \brief Mouse motion event structure (event.motion.*)
- */
-typedef struct SDL_MouseMotionEvent
-{
-    Uint32 type;        /**< ::SDL_MOUSEMOTION */
-    Uint32 timestamp;
-    Uint32 windowID;    /**< The window with mouse focus, if any */
-    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
-    Uint32 state;       /**< The current button state */
-    Sint32 x;           /**< X coordinate, relative to window */
-    Sint32 y;           /**< Y coordinate, relative to window */
-    Sint32 xrel;        /**< The relative motion in the X direction */
-    Sint32 yrel;        /**< The relative motion in the Y direction */
-} SDL_MouseMotionEvent;
-
-/**
- *  \brief Mouse button event structure (event.button.*)
- */
-typedef struct SDL_MouseButtonEvent
-{
-    Uint32 type;        /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */
-    Uint32 timestamp;
-    Uint32 windowID;    /**< The window with mouse focus, if any */
-    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
-    Uint8 button;       /**< The mouse button index */
-    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
-    Uint8 clicks;       /**< 1 for single-click, 2 for double-click, etc. */
-    Uint8 padding1;
-    Sint32 x;           /**< X coordinate, relative to window */
-    Sint32 y;           /**< Y coordinate, relative to window */
-} SDL_MouseButtonEvent;
-
-/**
- *  \brief Mouse wheel event structure (event.wheel.*)
- */
-typedef struct SDL_MouseWheelEvent
-{
-    Uint32 type;        /**< ::SDL_MOUSEWHEEL */
-    Uint32 timestamp;
-    Uint32 windowID;    /**< The window with mouse focus, if any */
-    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
-    Sint32 x;           /**< The amount scrolled horizontally, positive to the right and negative to the left */
-    Sint32 y;           /**< The amount scrolled vertically, positive away from the user and negative toward the user */
-} SDL_MouseWheelEvent;
-
-/**
- *  \brief Joystick axis motion event structure (event.jaxis.*)
- */
-typedef struct SDL_JoyAxisEvent
-{
-    Uint32 type;        /**< ::SDL_JOYAXISMOTION */
-    Uint32 timestamp;
-    SDL_JoystickID which; /**< The joystick instance id */
-    Uint8 axis;         /**< The joystick axis index */
-    Uint8 padding1;
-    Uint8 padding2;
-    Uint8 padding3;
-    Sint16 value;       /**< The axis value (range: -32768 to 32767) */
-    Uint16 padding4;
-} SDL_JoyAxisEvent;
-
-/**
- *  \brief Joystick trackball motion event structure (event.jball.*)
- */
-typedef struct SDL_JoyBallEvent
-{
-    Uint32 type;        /**< ::SDL_JOYBALLMOTION */
-    Uint32 timestamp;
-    SDL_JoystickID which; /**< The joystick instance id */
-    Uint8 ball;         /**< The joystick trackball index */
-    Uint8 padding1;
-    Uint8 padding2;
-    Uint8 padding3;
-    Sint16 xrel;        /**< The relative motion in the X direction */
-    Sint16 yrel;        /**< The relative motion in the Y direction */
-} SDL_JoyBallEvent;
-
-/**
- *  \brief Joystick hat position change event structure (event.jhat.*)
- */
-typedef struct SDL_JoyHatEvent
-{
-    Uint32 type;        /**< ::SDL_JOYHATMOTION */
-    Uint32 timestamp;
-    SDL_JoystickID which; /**< The joystick instance id */
-    Uint8 hat;          /**< The joystick hat index */
-    Uint8 value;        /**< The hat position value.
-                         *   \sa ::SDL_HAT_LEFTUP ::SDL_HAT_UP ::SDL_HAT_RIGHTUP
-                         *   \sa ::SDL_HAT_LEFT ::SDL_HAT_CENTERED ::SDL_HAT_RIGHT
-                         *   \sa ::SDL_HAT_LEFTDOWN ::SDL_HAT_DOWN ::SDL_HAT_RIGHTDOWN
-                         *
-                         *   Note that zero means the POV is centered.
-                         */
-    Uint8 padding1;
-    Uint8 padding2;
-} SDL_JoyHatEvent;
-
-/**
- *  \brief Joystick button event structure (event.jbutton.*)
- */
-typedef struct SDL_JoyButtonEvent
-{
-    Uint32 type;        /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */
-    Uint32 timestamp;
-    SDL_JoystickID which; /**< The joystick instance id */
-    Uint8 button;       /**< The joystick button index */
-    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
-    Uint8 padding1;
-    Uint8 padding2;
-} SDL_JoyButtonEvent;
-
-/**
- *  \brief Joystick device event structure (event.jdevice.*)
- */
-typedef struct SDL_JoyDeviceEvent
-{
-    Uint32 type;        /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */
-    Uint32 timestamp;
-    Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED event */
-} SDL_JoyDeviceEvent;
-
-
-/**
- *  \brief Game controller axis motion event structure (event.caxis.*)
- */
-typedef struct SDL_ControllerAxisEvent
-{
-    Uint32 type;        /**< ::SDL_CONTROLLERAXISMOTION */
-    Uint32 timestamp;
-    SDL_JoystickID which; /**< The joystick instance id */
-    Uint8 axis;         /**< The controller axis (SDL_GameControllerAxis) */
-    Uint8 padding1;
-    Uint8 padding2;
-    Uint8 padding3;
-    Sint16 value;       /**< The axis value (range: -32768 to 32767) */
-    Uint16 padding4;
-} SDL_ControllerAxisEvent;
-
-
-/**
- *  \brief Game controller button event structure (event.cbutton.*)
- */
-typedef struct SDL_ControllerButtonEvent
-{
-    Uint32 type;        /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */
-    Uint32 timestamp;
-    SDL_JoystickID which; /**< The joystick instance id */
-    Uint8 button;       /**< The controller button (SDL_GameControllerButton) */
-    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
-    Uint8 padding1;
-    Uint8 padding2;
-} SDL_ControllerButtonEvent;
-
-
-/**
- *  \brief Controller device event structure (event.cdevice.*)
- */
-typedef struct SDL_ControllerDeviceEvent
-{
-    Uint32 type;        /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */
-    Uint32 timestamp;
-    Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */
-} SDL_ControllerDeviceEvent;
-
-
-/**
- *  \brief Touch finger event structure (event.tfinger.*)
- */
-typedef struct SDL_TouchFingerEvent
-{
-    Uint32 type;        /**< ::SDL_FINGERMOTION or ::SDL_FINGERDOWN or ::SDL_FINGERUP */
-    Uint32 timestamp;
-    SDL_TouchID touchId; /**< The touch device id */
-    SDL_FingerID fingerId;
-    float x;            /**< Normalized in the range 0...1 */
-    float y;            /**< Normalized in the range 0...1 */
-    float dx;           /**< Normalized in the range 0...1 */
-    float dy;           /**< Normalized in the range 0...1 */
-    float pressure;     /**< Normalized in the range 0...1 */
-} SDL_TouchFingerEvent;
-
-
-/**
- *  \brief Multiple Finger Gesture Event (event.mgesture.*)
- */
-typedef struct SDL_MultiGestureEvent
-{
-    Uint32 type;        /**< ::SDL_MULTIGESTURE */
-    Uint32 timestamp;
-    SDL_TouchID touchId; /**< The touch device index */
-    float dTheta;
-    float dDist;
-    float x;
-    float y;
-    Uint16 numFingers;
-    Uint16 padding;
-} SDL_MultiGestureEvent;
-
-
-/**
- * \brief Dollar Gesture Event (event.dgesture.*)
- */
-typedef struct SDL_DollarGestureEvent
-{
-    Uint32 type;        /**< ::SDL_DOLLARGESTURE */
-    Uint32 timestamp;
-    SDL_TouchID touchId; /**< The touch device id */
-    SDL_GestureID gestureId;
-    Uint32 numFingers;
-    float error;
-    float x;            /**< Normalized center of gesture */
-    float y;            /**< Normalized center of gesture */
-} SDL_DollarGestureEvent;
-
-
-/**
- *  \brief An event used to request a file open by the system (event.drop.*)
- *         This event is disabled by default, you can enable it with SDL_EventState()
- *  \note If you enable this event, you must free the filename in the event.
- */
-typedef struct SDL_DropEvent
-{
-    Uint32 type;        /**< ::SDL_DROPFILE */
-    Uint32 timestamp;
-    char *file;         /**< The file name, which should be freed with SDL_free() */
-} SDL_DropEvent;
-
-
-/**
- *  \brief The "quit requested" event
- */
-typedef struct SDL_QuitEvent
-{
-    Uint32 type;        /**< ::SDL_QUIT */
-    Uint32 timestamp;
-} SDL_QuitEvent;
-
-/**
- *  \brief OS Specific event
- */
-typedef struct SDL_OSEvent
-{
-    Uint32 type;        /**< ::SDL_QUIT */
-    Uint32 timestamp;
-} SDL_OSEvent;
-
-/**
- *  \brief A user-defined event type (event.user.*)
- */
-typedef struct SDL_UserEvent
-{
-    Uint32 type;        /**< ::SDL_USEREVENT through ::SDL_LASTEVENT-1 */
-    Uint32 timestamp;
-    Uint32 windowID;    /**< The associated window if any */
-    Sint32 code;        /**< User defined event code */
-    void *data1;        /**< User defined data pointer */
-    void *data2;        /**< User defined data pointer */
-} SDL_UserEvent;
-
-
-struct SDL_SysWMmsg;
-typedef struct SDL_SysWMmsg SDL_SysWMmsg;
-
-/**
- *  \brief A video driver dependent system event (event.syswm.*)
- *         This event is disabled by default, you can enable it with SDL_EventState()
- *
- *  \note If you want to use this event, you should include SDL_syswm.h.
- */
-typedef struct SDL_SysWMEvent
-{
-    Uint32 type;        /**< ::SDL_SYSWMEVENT */
-    Uint32 timestamp;
-    SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
-} SDL_SysWMEvent;
-
-/**
- *  \brief General event structure
- */
-typedef union SDL_Event
-{
-    Uint32 type;                    /**< Event type, shared with all events */
-    SDL_CommonEvent common;         /**< Common event data */
-    SDL_WindowEvent window;         /**< Window event data */
-    SDL_KeyboardEvent key;          /**< Keyboard event data */
-    SDL_TextEditingEvent edit;      /**< Text editing event data */
-    SDL_TextInputEvent text;        /**< Text input event data */
-    SDL_MouseMotionEvent motion;    /**< Mouse motion event data */
-    SDL_MouseButtonEvent button;    /**< Mouse button event data */
-    SDL_MouseWheelEvent wheel;      /**< Mouse wheel event data */
-    SDL_JoyAxisEvent jaxis;         /**< Joystick axis event data */
-    SDL_JoyBallEvent jball;         /**< Joystick ball event data */
-    SDL_JoyHatEvent jhat;           /**< Joystick hat event data */
-    SDL_JoyButtonEvent jbutton;     /**< Joystick button event data */
-    SDL_JoyDeviceEvent jdevice;     /**< Joystick device change event data */
-    SDL_ControllerAxisEvent caxis;      /**< Game Controller axis event data */
-    SDL_ControllerButtonEvent cbutton;  /**< Game Controller button event data */
-    SDL_ControllerDeviceEvent cdevice;  /**< Game Controller device event data */
-    SDL_QuitEvent quit;             /**< Quit request event data */
-    SDL_UserEvent user;             /**< Custom event data */
-    SDL_SysWMEvent syswm;           /**< System dependent window event data */
-    SDL_TouchFingerEvent tfinger;   /**< Touch finger event data */
-    SDL_MultiGestureEvent mgesture; /**< Gesture event data */
-    SDL_DollarGestureEvent dgesture; /**< Gesture event data */
-    SDL_DropEvent drop;             /**< Drag and drop event data */
-
-    /* This is necessary for ABI compatibility between Visual C++ and GCC
-       Visual C++ will respect the push pack pragma and use 52 bytes for
-       this structure, and GCC will use the alignment of the largest datatype
-       within the union, which is 8 bytes.
-
-       So... we'll add padding to force the size to be 56 bytes for both.
-    */
-    Uint8 padding[56];
-} SDL_Event;
-
-
-/* Function prototypes */
-
-/**
- *  Pumps the event loop, gathering events from the input devices.
- *
- *  This function updates the event queue and internal input device state.
- *
- *  This should only be run in the thread that sets the video mode.
- */
-extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
-
-/* @{ */
-typedef enum
-{
-    SDL_ADDEVENT,
-    SDL_PEEKEVENT,
-    SDL_GETEVENT
-} SDL_eventaction;
-
-/**
- *  Checks the event queue for messages and optionally returns them.
- *
- *  If \c action is ::SDL_ADDEVENT, up to \c numevents events will be added to
- *  the back of the event queue.
- *
- *  If \c action is ::SDL_PEEKEVENT, up to \c numevents events at the front
- *  of the event queue, within the specified minimum and maximum type,
- *  will be returned and will not be removed from the queue.
- *
- *  If \c action is ::SDL_GETEVENT, up to \c numevents events at the front
- *  of the event queue, within the specified minimum and maximum type,
- *  will be returned and will be removed from the queue.
- *
- *  \return The number of events actually stored, or -1 if there was an error.
- *
- *  This function is thread-safe.
- */
-extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents,
-                                           SDL_eventaction action,
-                                           Uint32 minType, Uint32 maxType);
-/* @} */
-
-/**
- *  Checks to see if certain event types are in the event queue.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 type);
-extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType);
-
-/**
- *  This function clears events from the event queue
- */
-extern DECLSPEC void SDLCALL SDL_FlushEvent(Uint32 type);
-extern DECLSPEC void SDLCALL SDL_FlushEvents(Uint32 minType, Uint32 maxType);
-
-/**
- *  \brief Polls for currently pending events.
- *
- *  \return 1 if there are any pending events, or 0 if there are none available.
- *
- *  \param event If not NULL, the next event is removed from the queue and
- *               stored in that area.
- */
-extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event);
-
-/**
- *  \brief Waits indefinitely for the next available event.
- *
- *  \return 1, or 0 if there was an error while waiting for events.
- *
- *  \param event If not NULL, the next event is removed from the queue and
- *               stored in that area.
- */
-extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event);
-
-/**
- *  \brief Waits until the specified timeout (in milliseconds) for the next
- *         available event.
- *
- *  \return 1, or 0 if there was an error while waiting for events.
- *
- *  \param event If not NULL, the next event is removed from the queue and
- *               stored in that area.
- *  \param timeout The timeout (in milliseconds) to wait for next event.
- */
-extern DECLSPEC int SDLCALL SDL_WaitEventTimeout(SDL_Event * event,
-                                                 int timeout);
-
-/**
- *  \brief Add an event to the event queue.
- *
- *  \return 1 on success, 0 if the event was filtered, or -1 if the event queue
- *          was full or there was some other error.
- */
-extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event);
-
-typedef int (SDLCALL * SDL_EventFilter) (void *userdata, SDL_Event * event);
-
-/**
- *  Sets up a filter to process all events before they change internal state and
- *  are posted to the internal event queue.
- *
- *  The filter is prototyped as:
- *  \code
- *      int SDL_EventFilter(void *userdata, SDL_Event * event);
- *  \endcode
- *
- *  If the filter returns 1, then the event will be added to the internal queue.
- *  If it returns 0, then the event will be dropped from the queue, but the
- *  internal state will still be updated.  This allows selective filtering of
- *  dynamically arriving events.
- *
- *  \warning  Be very careful of what you do in the event filter function, as
- *            it may run in a different thread!
- *
- *  There is one caveat when dealing with the ::SDL_QuitEvent event type.  The
- *  event filter is only called when the window manager desires to close the
- *  application window.  If the event filter returns 1, then the window will
- *  be closed, otherwise the window will remain open if possible.
- *
- *  If the quit event is generated by an interrupt signal, it will bypass the
- *  internal queue and be delivered to the application at the next event poll.
- */
-extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter,
-                                                void *userdata);
-
-/**
- *  Return the current event filter - can be used to "chain" filters.
- *  If there is no event filter set, this function returns SDL_FALSE.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_GetEventFilter(SDL_EventFilter * filter,
-                                                    void **userdata);
-
-/**
- *  Add a function which is called when an event is added to the queue.
- */
-extern DECLSPEC void SDLCALL SDL_AddEventWatch(SDL_EventFilter filter,
-                                               void *userdata);
-
-/**
- *  Remove an event watch function added with SDL_AddEventWatch()
- */
-extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter,
-                                               void *userdata);
-
-/**
- *  Run the filter function on the current event queue, removing any
- *  events for which the filter returns 0.
- */
-extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
-                                              void *userdata);
-
-/* @{ */
-#define SDL_QUERY   -1
-#define SDL_IGNORE   0
-#define SDL_DISABLE  0
-#define SDL_ENABLE   1
-
-/**
- *  This function allows you to set the state of processing certain events.
- *   - If \c state is set to ::SDL_IGNORE, that event will be automatically
- *     dropped from the event queue and will not event be filtered.
- *   - If \c state is set to ::SDL_ENABLE, that event will be processed
- *     normally.
- *   - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the
- *     current processing state of the specified event.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state);
-/* @} */
-#define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY)
-
-/**
- *  This function allocates a set of user-defined events, and returns
- *  the beginning event number for that set of events.
- *
- *  If there aren't enough user-defined events left, this function
- *  returns (Uint32)-1
- */
-extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_events_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_filesystem.h b/linux-x86/include/SDL2/SDL_filesystem.h
deleted file mode 100644
index de3e227..0000000
--- a/linux-x86/include/SDL2/SDL_filesystem.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_filesystem.h
- *
- *  \brief Include file for filesystem SDL API functions
- */
-
-#ifndef _SDL_filesystem_h
-#define _SDL_filesystem_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief Get the path where the application resides.
- *
- * Get the "base path". This is the directory where the application was run
- *  from, which is probably the installation directory, and may or may not
- *  be the process's current working directory.
- *
- * This returns an absolute path in UTF-8 encoding, and is guaranteed to
- *  end with a path separator ('\\' on Windows, '/' most other places).
- *
- * The pointer returned by this function is owned by you. Please call
- *  SDL_free() on the pointer when you are done with it, or it will be a
- *  memory leak. This is not necessarily a fast call, though, so you should
- *  call this once near startup and save the string if you need it.
- *
- * Some platforms can't determine the application's path, and on other
- *  platforms, this might be meaningless. In such cases, this function will
- *  return NULL.
- *
- *  \return String of base dir in UTF-8 encoding, or NULL on error.
- *
- * \sa SDL_GetPrefPath
- */
-extern DECLSPEC char *SDLCALL SDL_GetBasePath(void);
-
-/**
- * \brief Get the user-and-app-specific path where files can be written.
- *
- * Get the "pref dir". This is meant to be where users can write personal
- *  files (preferences and save games, etc) that are specific to your
- *  application. This directory is unique per user, per application.
- *
- * This function will decide the appropriate location in the native filesystem,
- *  create the directory if necessary, and return a string of the absolute
- *  path to the directory in UTF-8 encoding.
- *
- * On Windows, the string might look like:
- *  "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\"
- *
- * On Linux, the string might look like:
- *  "/home/bob/.local/share/My Program Name/"
- *
- * On Mac OS X, the string might look like:
- *  "/Users/bob/Library/Application Support/My Program Name/"
- *
- * (etc.)
- *
- * You specify the name of your organization (if it's not a real organization,
- *  your name or an Internet domain you own might do) and the name of your
- *  application. These should be untranslated proper names.
- *
- * Both the org and app strings may become part of a directory name, so
- *  please follow these rules:
- *
- *    - Try to use the same org string (including case-sensitivity) for
- *      all your applications that use this function.
- *    - Always use a unique app string for each one, and make sure it never
- *      changes for an app once you've decided on it.
- *    - Unicode characters are legal, as long as it's UTF-8 encoded, but...
- *    - ...only use letters, numbers, and spaces. Avoid punctuation like
- *      "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient.
- *
- * This returns an absolute path in UTF-8 encoding, and is guaranteed to
- *  end with a path separator ('\\' on Windows, '/' most other places).
- *
- * The pointer returned by this function is owned by you. Please call
- *  SDL_free() on the pointer when you are done with it, or it will be a
- *  memory leak. This is not necessarily a fast call, though, so you should
- *  call this once near startup and save the string if you need it.
- *
- * You should assume the path returned by this function is the only safe
- *  place to write files (and that SDL_GetBasePath(), while it might be
- *  writable, or even the parent of the returned path, aren't where you
- *  should be writing things).
- *
- * Some platforms can't determine the pref path, and on other
- *  platforms, this might be meaningless. In such cases, this function will
- *  return NULL.
- *
- *   \param org The name of your organization.
- *   \param app The name of your application.
- *  \return UTF-8 string of user dir in platform-dependent notation. NULL
- *          if there's a problem (creating directory failed, etc).
- *
- * \sa SDL_GetBasePath
- */
-extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_system_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_gamecontroller.h b/linux-x86/include/SDL2/SDL_gamecontroller.h
deleted file mode 100644
index b00ad71..0000000
--- a/linux-x86/include/SDL2/SDL_gamecontroller.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_gamecontroller.h
- *
- *  Include file for SDL game controller event handling
- */
-
-#ifndef _SDL_gamecontroller_h
-#define _SDL_gamecontroller_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_rwops.h"
-#include "SDL_joystick.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \file SDL_gamecontroller.h
- *
- *  In order to use these functions, SDL_Init() must have been called
- *  with the ::SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
- *  for game controllers, and load appropriate drivers.
- *
- *  If you would like to receive controller updates while the application
- *  is in the background, you should set the following hint before calling
- *  SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS
- */
-
-/* The gamecontroller structure used to identify an SDL game controller */
-struct _SDL_GameController;
-typedef struct _SDL_GameController SDL_GameController;
-
-
-typedef enum
-{
-    SDL_CONTROLLER_BINDTYPE_NONE = 0,
-    SDL_CONTROLLER_BINDTYPE_BUTTON,
-    SDL_CONTROLLER_BINDTYPE_AXIS,
-    SDL_CONTROLLER_BINDTYPE_HAT
-} SDL_GameControllerBindType;
-
-/**
- *  Get the SDL joystick layer binding for this controller button/axis mapping
- */
-typedef struct SDL_GameControllerButtonBind
-{
-    SDL_GameControllerBindType bindType;
-    union
-    {
-        int button;
-        int axis;
-        struct {
-            int hat;
-            int hat_mask;
-        } hat;
-    } value;
-
-} SDL_GameControllerButtonBind;
-
-
-/**
- *  To count the number of game controllers in the system for the following:
- *  int nJoysticks = SDL_NumJoysticks();
- *  int nGameControllers = 0;
- *  for ( int i = 0; i < nJoysticks; i++ ) {
- *      if ( SDL_IsGameController(i) ) {
- *          nGameControllers++;
- *      }
- *  }
- *
- *  Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is:
- *  guid,name,mappings
- *
- *  Where GUID is the string value from SDL_JoystickGetGUIDString(), name is the human readable string for the device and mappings are controller mappings to joystick ones.
- *  Under Windows there is a reserved GUID of "xinput" that covers any XInput devices.
- *  The mapping format for joystick is:
- *      bX - a joystick button, index X
- *      hX.Y - hat X with value Y
- *      aX - axis X of the joystick
- *  Buttons can be used as a controller axis and vice versa.
- *
- *  This string shows an example of a valid mapping for a controller
- *  "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7",
- *
- */
-
-/**
- *  Load a set of mappings from a seekable SDL data stream (memory or file), filtered by the current SDL_GetPlatform()
- *  A community sourced database of controllers is available at https://raw.github.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt
- *
- *  If \c freerw is non-zero, the stream will be closed after being read.
- * 
- * \return number of mappings added, -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW( SDL_RWops * rw, int freerw );
-
-/**
- *  Load a set of mappings from a file, filtered by the current SDL_GetPlatform()
- *
- *  Convenience macro.
- */
-#define SDL_GameControllerAddMappingsFromFile(file)   SDL_GameControllerAddMappingsFromRW(SDL_RWFromFile(file, "rb"), 1)
-
-/**
- *  Add or update an existing mapping configuration
- *
- * \return 1 if mapping is added, 0 if updated, -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping( const char* mappingString );
-
-/**
- *  Get a mapping string for a GUID
- *
- *  \return the mapping string.  Must be freed with SDL_free.  Returns NULL if no mapping is available
- */
-extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForGUID( SDL_JoystickGUID guid );
-
-/**
- *  Get a mapping string for an open GameController
- *
- *  \return the mapping string.  Must be freed with SDL_free.  Returns NULL if no mapping is available
- */
-extern DECLSPEC char * SDLCALL SDL_GameControllerMapping( SDL_GameController * gamecontroller );
-
-/**
- *  Is the joystick on this index supported by the game controller interface?
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsGameController(int joystick_index);
-
-
-/**
- *  Get the implementation dependent name of a game controller.
- *  This can be called before any controllers are opened.
- *  If no name can be found, this function returns NULL.
- */
-extern DECLSPEC const char *SDLCALL SDL_GameControllerNameForIndex(int joystick_index);
-
-/**
- *  Open a game controller for use.
- *  The index passed as an argument refers to the N'th game controller on the system.
- *  This index is the value which will identify this controller in future controller
- *  events.
- *
- *  \return A controller identifier, or NULL if an error occurred.
- */
-extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerOpen(int joystick_index);
-
-/**
- *  Return the name for this currently opened controller
- */
-extern DECLSPEC const char *SDLCALL SDL_GameControllerName(SDL_GameController *gamecontroller);
-
-/**
- *  Returns SDL_TRUE if the controller has been opened and currently connected,
- *  or SDL_FALSE if it has not.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerGetAttached(SDL_GameController *gamecontroller);
-
-/**
- *  Get the underlying joystick object used by a controller
- */
-extern DECLSPEC SDL_Joystick *SDLCALL SDL_GameControllerGetJoystick(SDL_GameController *gamecontroller);
-
-/**
- *  Enable/disable controller event polling.
- *
- *  If controller events are disabled, you must call SDL_GameControllerUpdate()
- *  yourself and check the state of the controller when you want controller
- *  information.
- *
- *  The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE.
- */
-extern DECLSPEC int SDLCALL SDL_GameControllerEventState(int state);
-
-/**
- *  Update the current state of the open game controllers.
- *
- *  This is called automatically by the event loop if any game controller
- *  events are enabled.
- */
-extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void);
-
-
-/**
- *  The list of axes available from a controller
- */
-typedef enum
-{
-    SDL_CONTROLLER_AXIS_INVALID = -1,
-    SDL_CONTROLLER_AXIS_LEFTX,
-    SDL_CONTROLLER_AXIS_LEFTY,
-    SDL_CONTROLLER_AXIS_RIGHTX,
-    SDL_CONTROLLER_AXIS_RIGHTY,
-    SDL_CONTROLLER_AXIS_TRIGGERLEFT,
-    SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
-    SDL_CONTROLLER_AXIS_MAX
-} SDL_GameControllerAxis;
-
-/**
- *  turn this string into a axis mapping
- */
-extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString);
-
-/**
- *  turn this axis enum into a string mapping
- */
-extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForAxis(SDL_GameControllerAxis axis);
-
-/**
- *  Get the SDL joystick layer binding for this controller button mapping
- */
-extern DECLSPEC SDL_GameControllerButtonBind SDLCALL
-SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller,
-                                 SDL_GameControllerAxis axis);
-
-/**
- *  Get the current state of an axis control on a game controller.
- *
- *  The state is a value ranging from -32768 to 32767.
- *
- *  The axis indices start at index 0.
- */
-extern DECLSPEC Sint16 SDLCALL
-SDL_GameControllerGetAxis(SDL_GameController *gamecontroller,
-                          SDL_GameControllerAxis axis);
-
-/**
- *  The list of buttons available from a controller
- */
-typedef enum
-{
-    SDL_CONTROLLER_BUTTON_INVALID = -1,
-    SDL_CONTROLLER_BUTTON_A,
-    SDL_CONTROLLER_BUTTON_B,
-    SDL_CONTROLLER_BUTTON_X,
-    SDL_CONTROLLER_BUTTON_Y,
-    SDL_CONTROLLER_BUTTON_BACK,
-    SDL_CONTROLLER_BUTTON_GUIDE,
-    SDL_CONTROLLER_BUTTON_START,
-    SDL_CONTROLLER_BUTTON_LEFTSTICK,
-    SDL_CONTROLLER_BUTTON_RIGHTSTICK,
-    SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
-    SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
-    SDL_CONTROLLER_BUTTON_DPAD_UP,
-    SDL_CONTROLLER_BUTTON_DPAD_DOWN,
-    SDL_CONTROLLER_BUTTON_DPAD_LEFT,
-    SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
-    SDL_CONTROLLER_BUTTON_MAX
-} SDL_GameControllerButton;
-
-/**
- *  turn this string into a button mapping
- */
-extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString);
-
-/**
- *  turn this button enum into a string mapping
- */
-extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForButton(SDL_GameControllerButton button);
-
-/**
- *  Get the SDL joystick layer binding for this controller button mapping
- */
-extern DECLSPEC SDL_GameControllerButtonBind SDLCALL
-SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller,
-                                   SDL_GameControllerButton button);
-
-
-/**
- *  Get the current state of a button on a game controller.
- *
- *  The button indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller,
-                                                          SDL_GameControllerButton button);
-
-/**
- *  Close a controller previously opened with SDL_GameControllerOpen().
- */
-extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecontroller);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_gamecontroller_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_gesture.h b/linux-x86/include/SDL2/SDL_gesture.h
deleted file mode 100644
index dbc1692..0000000
--- a/linux-x86/include/SDL2/SDL_gesture.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_gesture.h
- *
- *  Include file for SDL gesture event handling.
- */
-
-#ifndef _SDL_gesture_h
-#define _SDL_gesture_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-
-#include "SDL_touch.h"
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef Sint64 SDL_GestureID;
-
-/* Function prototypes */
-
-/**
- *  \brief Begin Recording a gesture on the specified touch, or all touches (-1)
- *
- *
- */
-extern DECLSPEC int SDLCALL SDL_RecordGesture(SDL_TouchID touchId);
-
-
-/**
- *  \brief Save all currently loaded Dollar Gesture templates
- *
- *
- */
-extern DECLSPEC int SDLCALL SDL_SaveAllDollarTemplates(SDL_RWops *dst);
-
-/**
- *  \brief Save a currently loaded Dollar Gesture template
- *
- *
- */
-extern DECLSPEC int SDLCALL SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *dst);
-
-
-/**
- *  \brief Load Dollar Gesture templates from a file
- *
- *
- */
-extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_gesture_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_haptic.h b/linux-x86/include/SDL2/SDL_haptic.h
deleted file mode 100644
index 234975a..0000000
--- a/linux-x86/include/SDL2/SDL_haptic.h
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_haptic.h
- *
- *  \brief The SDL Haptic subsystem allows you to control haptic (force feedback)
- *         devices.
- *
- *  The basic usage is as follows:
- *   - Initialize the Subsystem (::SDL_INIT_HAPTIC).
- *   - Open a Haptic Device.
- *    - SDL_HapticOpen() to open from index.
- *    - SDL_HapticOpenFromJoystick() to open from an existing joystick.
- *   - Create an effect (::SDL_HapticEffect).
- *   - Upload the effect with SDL_HapticNewEffect().
- *   - Run the effect with SDL_HapticRunEffect().
- *   - (optional) Free the effect with SDL_HapticDestroyEffect().
- *   - Close the haptic device with SDL_HapticClose().
- *
- * \par Simple rumble example:
- * \code
- *    SDL_Haptic *haptic;
- *
- *    // Open the device
- *    haptic = SDL_HapticOpen( 0 );
- *    if (haptic == NULL)
- *       return -1;
- *
- *    // Initialize simple rumble
- *    if (SDL_HapticRumbleInit( haptic ) != 0)
- *       return -1;
- *
- *    // Play effect at 50% strength for 2 seconds
- *    if (SDL_HapticRumblePlay( haptic, 0.5, 2000 ) != 0)
- *       return -1;
- *    SDL_Delay( 2000 );
- *
- *    // Clean up
- *    SDL_HapticClose( haptic );
- * \endcode
- *
- * \par Complete example:
- * \code
- * int test_haptic( SDL_Joystick * joystick ) {
- *    SDL_Haptic *haptic;
- *    SDL_HapticEffect effect;
- *    int effect_id;
- *
- *    // Open the device
- *    haptic = SDL_HapticOpenFromJoystick( joystick );
- *    if (haptic == NULL) return -1; // Most likely joystick isn't haptic
- *
- *    // See if it can do sine waves
- *    if ((SDL_HapticQuery(haptic) & SDL_HAPTIC_SINE)==0) {
- *       SDL_HapticClose(haptic); // No sine effect
- *       return -1;
- *    }
- *
- *    // Create the effect
- *    memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default
- *    effect.type = SDL_HAPTIC_SINE;
- *    effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates
- *    effect.periodic.direction.dir[0] = 18000; // Force comes from south
- *    effect.periodic.period = 1000; // 1000 ms
- *    effect.periodic.magnitude = 20000; // 20000/32767 strength
- *    effect.periodic.length = 5000; // 5 seconds long
- *    effect.periodic.attack_length = 1000; // Takes 1 second to get max strength
- *    effect.periodic.fade_length = 1000; // Takes 1 second to fade away
- *
- *    // Upload the effect
- *    effect_id = SDL_HapticNewEffect( haptic, &effect );
- *
- *    // Test the effect
- *    SDL_HapticRunEffect( haptic, effect_id, 1 );
- *    SDL_Delay( 5000); // Wait for the effect to finish
- *
- *    // We destroy the effect, although closing the device also does this
- *    SDL_HapticDestroyEffect( haptic, effect_id );
- *
- *    // Close the device
- *    SDL_HapticClose(haptic);
- *
- *    return 0; // Success
- * }
- * \endcode
- *
- * You can also find out more information on my blog:
- * http://bobbens.dyndns.org/journal/2010/sdl_haptic/
- *
- * \author Edgar Simo Serra
- */
-
-#ifndef _SDL_haptic_h
-#define _SDL_haptic_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_joystick.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- *  \typedef SDL_Haptic
- *
- *  \brief The haptic structure used to identify an SDL haptic.
- *
- *  \sa SDL_HapticOpen
- *  \sa SDL_HapticOpenFromJoystick
- *  \sa SDL_HapticClose
- */
-struct _SDL_Haptic;
-typedef struct _SDL_Haptic SDL_Haptic;
-
-
-/**
- *  \name Haptic features
- *
- *  Different haptic features a device can have.
- */
-/* @{ */
-
-/**
- *  \name Haptic effects
- */
-/* @{ */
-
-/**
- *  \brief Constant effect supported.
- *
- *  Constant haptic effect.
- *
- *  \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_CONSTANT   (1<<0)
-
-/**
- *  \brief Sine wave effect supported.
- *
- *  Periodic haptic effect that simulates sine waves.
- *
- *  \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SINE       (1<<1)
-
-/**
- *  \brief Left/Right effect supported.
- *
- *  Haptic effect for direct control over high/low frequency motors.
- *
- *  \sa SDL_HapticLeftRight
- * \warning this value was SDL_HAPTIC_SQUARE right before 2.0.0 shipped. Sorry,
- *          we ran out of bits, and this is important for XInput devices.
- */
-#define SDL_HAPTIC_LEFTRIGHT     (1<<2)
-
-/* !!! FIXME: put this back when we have more bits in 2.1 */
-/* #define SDL_HAPTIC_SQUARE     (1<<2) */
-
-/**
- *  \brief Triangle wave effect supported.
- *
- *  Periodic haptic effect that simulates triangular waves.
- *
- *  \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_TRIANGLE   (1<<3)
-
-/**
- *  \brief Sawtoothup wave effect supported.
- *
- *  Periodic haptic effect that simulates saw tooth up waves.
- *
- *  \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SAWTOOTHUP (1<<4)
-
-/**
- *  \brief Sawtoothdown wave effect supported.
- *
- *  Periodic haptic effect that simulates saw tooth down waves.
- *
- *  \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SAWTOOTHDOWN (1<<5)
-
-/**
- *  \brief Ramp effect supported.
- *
- *  Ramp haptic effect.
- *
- *  \sa SDL_HapticRamp
- */
-#define SDL_HAPTIC_RAMP       (1<<6)
-
-/**
- *  \brief Spring effect supported - uses axes position.
- *
- *  Condition haptic effect that simulates a spring.  Effect is based on the
- *  axes position.
- *
- *  \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_SPRING     (1<<7)
-
-/**
- *  \brief Damper effect supported - uses axes velocity.
- *
- *  Condition haptic effect that simulates dampening.  Effect is based on the
- *  axes velocity.
- *
- *  \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_DAMPER     (1<<8)
-
-/**
- *  \brief Inertia effect supported - uses axes acceleration.
- *
- *  Condition haptic effect that simulates inertia.  Effect is based on the axes
- *  acceleration.
- *
- *  \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_INERTIA    (1<<9)
-
-/**
- *  \brief Friction effect supported - uses axes movement.
- *
- *  Condition haptic effect that simulates friction.  Effect is based on the
- *  axes movement.
- *
- *  \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_FRICTION   (1<<10)
-
-/**
- *  \brief Custom effect is supported.
- *
- *  User defined custom haptic effect.
- */
-#define SDL_HAPTIC_CUSTOM     (1<<11)
-
-/* @} *//* Haptic effects */
-
-/* These last few are features the device has, not effects */
-
-/**
- *  \brief Device can set global gain.
- *
- *  Device supports setting the global gain.
- *
- *  \sa SDL_HapticSetGain
- */
-#define SDL_HAPTIC_GAIN       (1<<12)
-
-/**
- *  \brief Device can set autocenter.
- *
- *  Device supports setting autocenter.
- *
- *  \sa SDL_HapticSetAutocenter
- */
-#define SDL_HAPTIC_AUTOCENTER (1<<13)
-
-/**
- *  \brief Device can be queried for effect status.
- *
- *  Device can be queried for effect status.
- *
- *  \sa SDL_HapticGetEffectStatus
- */
-#define SDL_HAPTIC_STATUS     (1<<14)
-
-/**
- *  \brief Device can be paused.
- *
- *  \sa SDL_HapticPause
- *  \sa SDL_HapticUnpause
- */
-#define SDL_HAPTIC_PAUSE      (1<<15)
-
-
-/**
- * \name Direction encodings
- */
-/* @{ */
-
-/**
- *  \brief Uses polar coordinates for the direction.
- *
- *  \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_POLAR      0
-
-/**
- *  \brief Uses cartesian coordinates for the direction.
- *
- *  \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_CARTESIAN  1
-
-/**
- *  \brief Uses spherical coordinates for the direction.
- *
- *  \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_SPHERICAL  2
-
-/* @} *//* Direction encodings */
-
-/* @} *//* Haptic features */
-
-/*
- * Misc defines.
- */
-
-/**
- * \brief Used to play a device an infinite number of times.
- *
- * \sa SDL_HapticRunEffect
- */
-#define SDL_HAPTIC_INFINITY   4294967295U
-
-
-/**
- *  \brief Structure that represents a haptic direction.
- *
- *  Directions can be specified by:
- *   - ::SDL_HAPTIC_POLAR : Specified by polar coordinates.
- *   - ::SDL_HAPTIC_CARTESIAN : Specified by cartesian coordinates.
- *   - ::SDL_HAPTIC_SPHERICAL : Specified by spherical coordinates.
- *
- *  Cardinal directions of the haptic device are relative to the positioning
- *  of the device.  North is considered to be away from the user.
- *
- *  The following diagram represents the cardinal directions:
- *  \verbatim
-                 .--.
-                 |__| .-------.
-                 |=.| |.-----.|
-                 |--| ||     ||
-                 |  | |'-----'|
-                 |__|~')_____('
-                   [ COMPUTER ]
-
-
-                     North (0,-1)
-                         ^
-                         |
-                         |
-    (1,0)  West <----[ HAPTIC ]----> East (-1,0)
-                         |
-                         |
-                         v
-                      South (0,1)
-
-
-                      [ USER ]
-                        \|||/
-                        (o o)
-                  ---ooO-(_)-Ooo---
-    \endverbatim
- *
- *  If type is ::SDL_HAPTIC_POLAR, direction is encoded by hundredths of a
- *  degree starting north and turning clockwise.  ::SDL_HAPTIC_POLAR only uses
- *  the first \c dir parameter.  The cardinal directions would be:
- *   - North: 0 (0 degrees)
- *   - East: 9000 (90 degrees)
- *   - South: 18000 (180 degrees)
- *   - West: 27000 (270 degrees)
- *
- *  If type is ::SDL_HAPTIC_CARTESIAN, direction is encoded by three positions
- *  (X axis, Y axis and Z axis (with 3 axes)).  ::SDL_HAPTIC_CARTESIAN uses
- *  the first three \c dir parameters.  The cardinal directions would be:
- *   - North:  0,-1, 0
- *   - East:  -1, 0, 0
- *   - South:  0, 1, 0
- *   - West:   1, 0, 0
- *
- *  The Z axis represents the height of the effect if supported, otherwise
- *  it's unused.  In cartesian encoding (1, 2) would be the same as (2, 4), you
- *  can use any multiple you want, only the direction matters.
- *
- *  If type is ::SDL_HAPTIC_SPHERICAL, direction is encoded by two rotations.
- *  The first two \c dir parameters are used.  The \c dir parameters are as
- *  follows (all values are in hundredths of degrees):
- *   - Degrees from (1, 0) rotated towards (0, 1).
- *   - Degrees towards (0, 0, 1) (device needs at least 3 axes).
- *
- *
- *  Example of force coming from the south with all encodings (force coming
- *  from the south means the user will have to pull the stick to counteract):
- *  \code
- *  SDL_HapticDirection direction;
- *
- *  // Cartesian directions
- *  direction.type = SDL_HAPTIC_CARTESIAN; // Using cartesian direction encoding.
- *  direction.dir[0] = 0; // X position
- *  direction.dir[1] = 1; // Y position
- *  // Assuming the device has 2 axes, we don't need to specify third parameter.
- *
- *  // Polar directions
- *  direction.type = SDL_HAPTIC_POLAR; // We'll be using polar direction encoding.
- *  direction.dir[0] = 18000; // Polar only uses first parameter
- *
- *  // Spherical coordinates
- *  direction.type = SDL_HAPTIC_SPHERICAL; // Spherical encoding
- *  direction.dir[0] = 9000; // Since we only have two axes we don't need more parameters.
- *  \endcode
- *
- *  \sa SDL_HAPTIC_POLAR
- *  \sa SDL_HAPTIC_CARTESIAN
- *  \sa SDL_HAPTIC_SPHERICAL
- *  \sa SDL_HapticEffect
- *  \sa SDL_HapticNumAxes
- */
-typedef struct SDL_HapticDirection
-{
-    Uint8 type;         /**< The type of encoding. */
-    Sint32 dir[3];      /**< The encoded direction. */
-} SDL_HapticDirection;
-
-
-/**
- *  \brief A structure containing a template for a Constant effect.
- *
- *  The struct is exclusive to the ::SDL_HAPTIC_CONSTANT effect.
- *
- *  A constant effect applies a constant force in the specified direction
- *  to the joystick.
- *
- *  \sa SDL_HAPTIC_CONSTANT
- *  \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticConstant
-{
-    /* Header */
-    Uint16 type;            /**< ::SDL_HAPTIC_CONSTANT */
-    SDL_HapticDirection direction;  /**< Direction of the effect. */
-
-    /* Replay */
-    Uint32 length;          /**< Duration of the effect. */
-    Uint16 delay;           /**< Delay before starting the effect. */
-
-    /* Trigger */
-    Uint16 button;          /**< Button that triggers the effect. */
-    Uint16 interval;        /**< How soon it can be triggered again after button. */
-
-    /* Constant */
-    Sint16 level;           /**< Strength of the constant effect. */
-
-    /* Envelope */
-    Uint16 attack_length;   /**< Duration of the attack. */
-    Uint16 attack_level;    /**< Level at the start of the attack. */
-    Uint16 fade_length;     /**< Duration of the fade. */
-    Uint16 fade_level;      /**< Level at the end of the fade. */
-} SDL_HapticConstant;
-
-/**
- *  \brief A structure containing a template for a Periodic effect.
- *
- *  The struct handles the following effects:
- *   - ::SDL_HAPTIC_SINE
- *   - ::SDL_HAPTIC_LEFTRIGHT
- *   - ::SDL_HAPTIC_TRIANGLE
- *   - ::SDL_HAPTIC_SAWTOOTHUP
- *   - ::SDL_HAPTIC_SAWTOOTHDOWN
- *
- *  A periodic effect consists in a wave-shaped effect that repeats itself
- *  over time.  The type determines the shape of the wave and the parameters
- *  determine the dimensions of the wave.
- *
- *  Phase is given by hundredth of a cycle meaning that giving the phase a value
- *  of 9000 will displace it 25% of its period.  Here are sample values:
- *   -     0: No phase displacement.
- *   -  9000: Displaced 25% of its period.
- *   - 18000: Displaced 50% of its period.
- *   - 27000: Displaced 75% of its period.
- *   - 36000: Displaced 100% of its period, same as 0, but 0 is preferred.
- *
- *  Examples:
- *  \verbatim
-    SDL_HAPTIC_SINE
-      __      __      __      __
-     /  \    /  \    /  \    /
-    /    \__/    \__/    \__/
-
-    SDL_HAPTIC_SQUARE
-     __    __    __    __    __
-    |  |  |  |  |  |  |  |  |  |
-    |  |__|  |__|  |__|  |__|  |
-
-    SDL_HAPTIC_TRIANGLE
-      /\    /\    /\    /\    /\
-     /  \  /  \  /  \  /  \  /
-    /    \/    \/    \/    \/
-
-    SDL_HAPTIC_SAWTOOTHUP
-      /|  /|  /|  /|  /|  /|  /|
-     / | / | / | / | / | / | / |
-    /  |/  |/  |/  |/  |/  |/  |
-
-    SDL_HAPTIC_SAWTOOTHDOWN
-    \  |\  |\  |\  |\  |\  |\  |
-     \ | \ | \ | \ | \ | \ | \ |
-      \|  \|  \|  \|  \|  \|  \|
-    \endverbatim
- *
- *  \sa SDL_HAPTIC_SINE
- *  \sa SDL_HAPTIC_LEFTRIGHT
- *  \sa SDL_HAPTIC_TRIANGLE
- *  \sa SDL_HAPTIC_SAWTOOTHUP
- *  \sa SDL_HAPTIC_SAWTOOTHDOWN
- *  \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticPeriodic
-{
-    /* Header */
-    Uint16 type;        /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_LEFTRIGHT,
-                             ::SDL_HAPTIC_TRIANGLE, ::SDL_HAPTIC_SAWTOOTHUP or
-                             ::SDL_HAPTIC_SAWTOOTHDOWN */
-    SDL_HapticDirection direction;  /**< Direction of the effect. */
-
-    /* Replay */
-    Uint32 length;      /**< Duration of the effect. */
-    Uint16 delay;       /**< Delay before starting the effect. */
-
-    /* Trigger */
-    Uint16 button;      /**< Button that triggers the effect. */
-    Uint16 interval;    /**< How soon it can be triggered again after button. */
-
-    /* Periodic */
-    Uint16 period;      /**< Period of the wave. */
-    Sint16 magnitude;   /**< Peak value. */
-    Sint16 offset;      /**< Mean value of the wave. */
-    Uint16 phase;       /**< Horizontal shift given by hundredth of a cycle. */
-
-    /* Envelope */
-    Uint16 attack_length;   /**< Duration of the attack. */
-    Uint16 attack_level;    /**< Level at the start of the attack. */
-    Uint16 fade_length; /**< Duration of the fade. */
-    Uint16 fade_level;  /**< Level at the end of the fade. */
-} SDL_HapticPeriodic;
-
-/**
- *  \brief A structure containing a template for a Condition effect.
- *
- *  The struct handles the following effects:
- *   - ::SDL_HAPTIC_SPRING: Effect based on axes position.
- *   - ::SDL_HAPTIC_DAMPER: Effect based on axes velocity.
- *   - ::SDL_HAPTIC_INERTIA: Effect based on axes acceleration.
- *   - ::SDL_HAPTIC_FRICTION: Effect based on axes movement.
- *
- *  Direction is handled by condition internals instead of a direction member.
- *  The condition effect specific members have three parameters.  The first
- *  refers to the X axis, the second refers to the Y axis and the third
- *  refers to the Z axis.  The right terms refer to the positive side of the
- *  axis and the left terms refer to the negative side of the axis.  Please
- *  refer to the ::SDL_HapticDirection diagram for which side is positive and
- *  which is negative.
- *
- *  \sa SDL_HapticDirection
- *  \sa SDL_HAPTIC_SPRING
- *  \sa SDL_HAPTIC_DAMPER
- *  \sa SDL_HAPTIC_INERTIA
- *  \sa SDL_HAPTIC_FRICTION
- *  \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticCondition
-{
-    /* Header */
-    Uint16 type;            /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER,
-                                 ::SDL_HAPTIC_INERTIA or ::SDL_HAPTIC_FRICTION */
-    SDL_HapticDirection direction;  /**< Direction of the effect - Not used ATM. */
-
-    /* Replay */
-    Uint32 length;          /**< Duration of the effect. */
-    Uint16 delay;           /**< Delay before starting the effect. */
-
-    /* Trigger */
-    Uint16 button;          /**< Button that triggers the effect. */
-    Uint16 interval;        /**< How soon it can be triggered again after button. */
-
-    /* Condition */
-    Uint16 right_sat[3];    /**< Level when joystick is to the positive side. */
-    Uint16 left_sat[3];     /**< Level when joystick is to the negative side. */
-    Sint16 right_coeff[3];  /**< How fast to increase the force towards the positive side. */
-    Sint16 left_coeff[3];   /**< How fast to increase the force towards the negative side. */
-    Uint16 deadband[3];     /**< Size of the dead zone. */
-    Sint16 center[3];       /**< Position of the dead zone. */
-} SDL_HapticCondition;
-
-/**
- *  \brief A structure containing a template for a Ramp effect.
- *
- *  This struct is exclusively for the ::SDL_HAPTIC_RAMP effect.
- *
- *  The ramp effect starts at start strength and ends at end strength.
- *  It augments in linear fashion.  If you use attack and fade with a ramp
- *  the effects get added to the ramp effect making the effect become
- *  quadratic instead of linear.
- *
- *  \sa SDL_HAPTIC_RAMP
- *  \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticRamp
-{
-    /* Header */
-    Uint16 type;            /**< ::SDL_HAPTIC_RAMP */
-    SDL_HapticDirection direction;  /**< Direction of the effect. */
-
-    /* Replay */
-    Uint32 length;          /**< Duration of the effect. */
-    Uint16 delay;           /**< Delay before starting the effect. */
-
-    /* Trigger */
-    Uint16 button;          /**< Button that triggers the effect. */
-    Uint16 interval;        /**< How soon it can be triggered again after button. */
-
-    /* Ramp */
-    Sint16 start;           /**< Beginning strength level. */
-    Sint16 end;             /**< Ending strength level. */
-
-    /* Envelope */
-    Uint16 attack_length;   /**< Duration of the attack. */
-    Uint16 attack_level;    /**< Level at the start of the attack. */
-    Uint16 fade_length;     /**< Duration of the fade. */
-    Uint16 fade_level;      /**< Level at the end of the fade. */
-} SDL_HapticRamp;
-
-/**
- * \brief A structure containing a template for a Left/Right effect.
- *
- * This struct is exclusively for the ::SDL_HAPTIC_LEFTRIGHT effect.
- *
- * The Left/Right effect is used to explicitly control the large and small
- * motors, commonly found in modern game controllers. One motor is high
- * frequency, the other is low frequency.
- *
- * \sa SDL_HAPTIC_LEFTRIGHT
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticLeftRight
-{
-    /* Header */
-    Uint16 type;            /**< ::SDL_HAPTIC_LEFTRIGHT */
-
-    /* Replay */
-    Uint32 length;          /**< Duration of the effect. */
-
-    /* Rumble */
-    Uint16 large_magnitude; /**< Control of the large controller motor. */
-    Uint16 small_magnitude; /**< Control of the small controller motor. */
-} SDL_HapticLeftRight;
-
-/**
- *  \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect.
- *
- *  A custom force feedback effect is much like a periodic effect, where the
- *  application can define its exact shape.  You will have to allocate the
- *  data yourself.  Data should consist of channels * samples Uint16 samples.
- *
- *  If channels is one, the effect is rotated using the defined direction.
- *  Otherwise it uses the samples in data for the different axes.
- *
- *  \sa SDL_HAPTIC_CUSTOM
- *  \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticCustom
-{
-    /* Header */
-    Uint16 type;            /**< ::SDL_HAPTIC_CUSTOM */
-    SDL_HapticDirection direction;  /**< Direction of the effect. */
-
-    /* Replay */
-    Uint32 length;          /**< Duration of the effect. */
-    Uint16 delay;           /**< Delay before starting the effect. */
-
-    /* Trigger */
-    Uint16 button;          /**< Button that triggers the effect. */
-    Uint16 interval;        /**< How soon it can be triggered again after button. */
-
-    /* Custom */
-    Uint8 channels;         /**< Axes to use, minimum of one. */
-    Uint16 period;          /**< Sample periods. */
-    Uint16 samples;         /**< Amount of samples. */
-    Uint16 *data;           /**< Should contain channels*samples items. */
-
-    /* Envelope */
-    Uint16 attack_length;   /**< Duration of the attack. */
-    Uint16 attack_level;    /**< Level at the start of the attack. */
-    Uint16 fade_length;     /**< Duration of the fade. */
-    Uint16 fade_level;      /**< Level at the end of the fade. */
-} SDL_HapticCustom;
-
-/**
- *  \brief The generic template for any haptic effect.
- *
- *  All values max at 32767 (0x7FFF).  Signed values also can be negative.
- *  Time values unless specified otherwise are in milliseconds.
- *
- *  You can also pass ::SDL_HAPTIC_INFINITY to length instead of a 0-32767
- *  value.  Neither delay, interval, attack_length nor fade_length support
- *  ::SDL_HAPTIC_INFINITY.  Fade will also not be used since effect never ends.
- *
- *  Additionally, the ::SDL_HAPTIC_RAMP effect does not support a duration of
- *  ::SDL_HAPTIC_INFINITY.
- *
- *  Button triggers may not be supported on all devices, it is advised to not
- *  use them if possible.  Buttons start at index 1 instead of index 0 like
- *  the joystick.
- *
- *  If both attack_length and fade_level are 0, the envelope is not used,
- *  otherwise both values are used.
- *
- *  Common parts:
- *  \code
- *  // Replay - All effects have this
- *  Uint32 length;        // Duration of effect (ms).
- *  Uint16 delay;         // Delay before starting effect.
- *
- *  // Trigger - All effects have this
- *  Uint16 button;        // Button that triggers effect.
- *  Uint16 interval;      // How soon before effect can be triggered again.
- *
- *  // Envelope - All effects except condition effects have this
- *  Uint16 attack_length; // Duration of the attack (ms).
- *  Uint16 attack_level;  // Level at the start of the attack.
- *  Uint16 fade_length;   // Duration of the fade out (ms).
- *  Uint16 fade_level;    // Level at the end of the fade.
- *  \endcode
- *
- *
- *  Here we have an example of a constant effect evolution in time:
- *  \verbatim
-    Strength
-    ^
-    |
-    |    effect level -->  _________________
-    |                     /                 \
-    |                    /                   \
-    |                   /                     \
-    |                  /                       \
-    | attack_level --> |                        \
-    |                  |                        |  <---  fade_level
-    |
-    +--------------------------------------------------> Time
-                       [--]                 [---]
-                       attack_length        fade_length
-
-    [------------------][-----------------------]
-    delay               length
-    \endverbatim
- *
- *  Note either the attack_level or the fade_level may be above the actual
- *  effect level.
- *
- *  \sa SDL_HapticConstant
- *  \sa SDL_HapticPeriodic
- *  \sa SDL_HapticCondition
- *  \sa SDL_HapticRamp
- *  \sa SDL_HapticLeftRight
- *  \sa SDL_HapticCustom
- */
-typedef union SDL_HapticEffect
-{
-    /* Common for all force feedback effects */
-    Uint16 type;                    /**< Effect type. */
-    SDL_HapticConstant constant;    /**< Constant effect. */
-    SDL_HapticPeriodic periodic;    /**< Periodic effect. */
-    SDL_HapticCondition condition;  /**< Condition effect. */
-    SDL_HapticRamp ramp;            /**< Ramp effect. */
-    SDL_HapticLeftRight leftright;  /**< Left/Right effect. */
-    SDL_HapticCustom custom;        /**< Custom effect. */
-} SDL_HapticEffect;
-
-
-/* Function prototypes */
-/**
- *  \brief Count the number of haptic devices attached to the system.
- *
- *  \return Number of haptic devices detected on the system.
- */
-extern DECLSPEC int SDLCALL SDL_NumHaptics(void);
-
-/**
- *  \brief Get the implementation dependent name of a Haptic device.
- *
- *  This can be called before any joysticks are opened.
- *  If no name can be found, this function returns NULL.
- *
- *  \param device_index Index of the device to get its name.
- *  \return Name of the device or NULL on error.
- *
- *  \sa SDL_NumHaptics
- */
-extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index);
-
-/**
- *  \brief Opens a Haptic device for usage.
- *
- *  The index passed as an argument refers to the N'th Haptic device on this
- *  system.
- *
- *  When opening a haptic device, its gain will be set to maximum and
- *  autocenter will be disabled.  To modify these values use
- *  SDL_HapticSetGain() and SDL_HapticSetAutocenter().
- *
- *  \param device_index Index of the device to open.
- *  \return Device identifier or NULL on error.
- *
- *  \sa SDL_HapticIndex
- *  \sa SDL_HapticOpenFromMouse
- *  \sa SDL_HapticOpenFromJoystick
- *  \sa SDL_HapticClose
- *  \sa SDL_HapticSetGain
- *  \sa SDL_HapticSetAutocenter
- *  \sa SDL_HapticPause
- *  \sa SDL_HapticStopAll
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index);
-
-/**
- *  \brief Checks if the haptic device at index has been opened.
- *
- *  \param device_index Index to check to see if it has been opened.
- *  \return 1 if it has been opened or 0 if it hasn't.
- *
- *  \sa SDL_HapticOpen
- *  \sa SDL_HapticIndex
- */
-extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index);
-
-/**
- *  \brief Gets the index of a haptic device.
- *
- *  \param haptic Haptic device to get the index of.
- *  \return The index of the haptic device or -1 on error.
- *
- *  \sa SDL_HapticOpen
- *  \sa SDL_HapticOpened
- */
-extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic);
-
-/**
- *  \brief Gets whether or not the current mouse has haptic capabilities.
- *
- *  \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't.
- *
- *  \sa SDL_HapticOpenFromMouse
- */
-extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void);
-
-/**
- *  \brief Tries to open a haptic device from the current mouse.
- *
- *  \return The haptic device identifier or NULL on error.
- *
- *  \sa SDL_MouseIsHaptic
- *  \sa SDL_HapticOpen
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void);
-
-/**
- *  \brief Checks to see if a joystick has haptic features.
- *
- *  \param joystick Joystick to test for haptic capabilities.
- *  \return 1 if the joystick is haptic, 0 if it isn't
- *          or -1 if an error ocurred.
- *
- *  \sa SDL_HapticOpenFromJoystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick);
-
-/**
- *  \brief Opens a Haptic device for usage from a Joystick device.
- *
- *  You must still close the haptic device seperately.  It will not be closed
- *  with the joystick.
- *
- *  When opening from a joystick you should first close the haptic device before
- *  closing the joystick device.  If not, on some implementations the haptic
- *  device will also get unallocated and you'll be unable to use force feedback
- *  on that device.
- *
- *  \param joystick Joystick to create a haptic device from.
- *  \return A valid haptic device identifier on success or NULL on error.
- *
- *  \sa SDL_HapticOpen
- *  \sa SDL_HapticClose
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick *
-                                                               joystick);
-
-/**
- *  \brief Closes a Haptic device previously opened with SDL_HapticOpen().
- *
- *  \param haptic Haptic device to close.
- */
-extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic);
-
-/**
- *  \brief Returns the number of effects a haptic device can store.
- *
- *  On some platforms this isn't fully supported, and therefore is an
- *  approximation.  Always check to see if your created effect was actually
- *  created and do not rely solely on SDL_HapticNumEffects().
- *
- *  \param haptic The haptic device to query effect max.
- *  \return The number of effects the haptic device can store or
- *          -1 on error.
- *
- *  \sa SDL_HapticNumEffectsPlaying
- *  \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic);
-
-/**
- *  \brief Returns the number of effects a haptic device can play at the same
- *         time.
- *
- *  This is not supported on all platforms, but will always return a value.
- *  Added here for the sake of completeness.
- *
- *  \param haptic The haptic device to query maximum playing effects.
- *  \return The number of effects the haptic device can play at the same time
- *          or -1 on error.
- *
- *  \sa SDL_HapticNumEffects
- *  \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic);
-
-/**
- *  \brief Gets the haptic devices supported features in bitwise matter.
- *
- *  Example:
- *  \code
- *  if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) {
- *      printf("We have constant haptic effect!");
- *  }
- *  \endcode
- *
- *  \param haptic The haptic device to query.
- *  \return Haptic features in bitwise manner (OR'd).
- *
- *  \sa SDL_HapticNumEffects
- *  \sa SDL_HapticEffectSupported
- */
-extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic);
-
-
-/**
- *  \brief Gets the number of haptic axes the device has.
- *
- *  \sa SDL_HapticDirection
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic);
-
-/**
- *  \brief Checks to see if effect is supported by haptic.
- *
- *  \param haptic Haptic device to check on.
- *  \param effect Effect to check to see if it is supported.
- *  \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error.
- *
- *  \sa SDL_HapticQuery
- *  \sa SDL_HapticNewEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic,
-                                                      SDL_HapticEffect *
-                                                      effect);
-
-/**
- *  \brief Creates a new haptic effect on the device.
- *
- *  \param haptic Haptic device to create the effect on.
- *  \param effect Properties of the effect to create.
- *  \return The id of the effect on success or -1 on error.
- *
- *  \sa SDL_HapticUpdateEffect
- *  \sa SDL_HapticRunEffect
- *  \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic,
-                                                SDL_HapticEffect * effect);
-
-/**
- *  \brief Updates the properties of an effect.
- *
- *  Can be used dynamically, although behaviour when dynamically changing
- *  direction may be strange.  Specifically the effect may reupload itself
- *  and start playing from the start.  You cannot change the type either when
- *  running SDL_HapticUpdateEffect().
- *
- *  \param haptic Haptic device that has the effect.
- *  \param effect Effect to update.
- *  \param data New effect properties to use.
- *  \return 0 on success or -1 on error.
- *
- *  \sa SDL_HapticNewEffect
- *  \sa SDL_HapticRunEffect
- *  \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic,
-                                                   int effect,
-                                                   SDL_HapticEffect * data);
-
-/**
- *  \brief Runs the haptic effect on its associated haptic device.
- *
- *  If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over
- *  repeating the envelope (attack and fade) every time.  If you only want the
- *  effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length
- *  parameter.
- *
- *  \param haptic Haptic device to run the effect on.
- *  \param effect Identifier of the haptic effect to run.
- *  \param iterations Number of iterations to run the effect. Use
- *         ::SDL_HAPTIC_INFINITY for infinity.
- *  \return 0 on success or -1 on error.
- *
- *  \sa SDL_HapticStopEffect
- *  \sa SDL_HapticDestroyEffect
- *  \sa SDL_HapticGetEffectStatus
- */
-extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic,
-                                                int effect,
-                                                Uint32 iterations);
-
-/**
- *  \brief Stops the haptic effect on its associated haptic device.
- *
- *  \param haptic Haptic device to stop the effect on.
- *  \param effect Identifier of the effect to stop.
- *  \return 0 on success or -1 on error.
- *
- *  \sa SDL_HapticRunEffect
- *  \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic,
-                                                 int effect);
-
-/**
- *  \brief Destroys a haptic effect on the device.
- *
- *  This will stop the effect if it's running.  Effects are automatically
- *  destroyed when the device is closed.
- *
- *  \param haptic Device to destroy the effect on.
- *  \param effect Identifier of the effect to destroy.
- *
- *  \sa SDL_HapticNewEffect
- */
-extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic,
-                                                     int effect);
-
-/**
- *  \brief Gets the status of the current effect on the haptic device.
- *
- *  Device must support the ::SDL_HAPTIC_STATUS feature.
- *
- *  \param haptic Haptic device to query the effect status on.
- *  \param effect Identifier of the effect to query its status.
- *  \return 0 if it isn't playing, 1 if it is playing or -1 on error.
- *
- *  \sa SDL_HapticRunEffect
- *  \sa SDL_HapticStopEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic,
-                                                      int effect);
-
-/**
- *  \brief Sets the global gain of the device.
- *
- *  Device must support the ::SDL_HAPTIC_GAIN feature.
- *
- *  The user may specify the maximum gain by setting the environment variable
- *  SDL_HAPTIC_GAIN_MAX which should be between 0 and 100.  All calls to
- *  SDL_HapticSetGain() will scale linearly using SDL_HAPTIC_GAIN_MAX as the
- *  maximum.
- *
- *  \param haptic Haptic device to set the gain on.
- *  \param gain Value to set the gain to, should be between 0 and 100.
- *  \return 0 on success or -1 on error.
- *
- *  \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain);
-
-/**
- *  \brief Sets the global autocenter of the device.
- *
- *  Autocenter should be between 0 and 100.  Setting it to 0 will disable
- *  autocentering.
- *
- *  Device must support the ::SDL_HAPTIC_AUTOCENTER feature.
- *
- *  \param haptic Haptic device to set autocentering on.
- *  \param autocenter Value to set autocenter to, 0 disables autocentering.
- *  \return 0 on success or -1 on error.
- *
- *  \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic,
-                                                    int autocenter);
-
-/**
- *  \brief Pauses a haptic device.
- *
- *  Device must support the ::SDL_HAPTIC_PAUSE feature.  Call
- *  SDL_HapticUnpause() to resume playback.
- *
- *  Do not modify the effects nor add new ones while the device is paused.
- *  That can cause all sorts of weird errors.
- *
- *  \param haptic Haptic device to pause.
- *  \return 0 on success or -1 on error.
- *
- *  \sa SDL_HapticUnpause
- */
-extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic);
-
-/**
- *  \brief Unpauses a haptic device.
- *
- *  Call to unpause after SDL_HapticPause().
- *
- *  \param haptic Haptic device to pause.
- *  \return 0 on success or -1 on error.
- *
- *  \sa SDL_HapticPause
- */
-extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic);
-
-/**
- *  \brief Stops all the currently playing effects on a haptic device.
- *
- *  \param haptic Haptic device to stop.
- *  \return 0 on success or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic);
-
-/**
- *  \brief Checks to see if rumble is supported on a haptic device.
- *
- *  \param haptic Haptic device to check to see if it supports rumble.
- *  \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error.
- *
- *  \sa SDL_HapticRumbleInit
- *  \sa SDL_HapticRumblePlay
- *  \sa SDL_HapticRumbleStop
- */
-extern DECLSPEC int SDLCALL SDL_HapticRumbleSupported(SDL_Haptic * haptic);
-
-/**
- *  \brief Initializes the haptic device for simple rumble playback.
- *
- *  \param haptic Haptic device to initialize for simple rumble playback.
- *  \return 0 on success or -1 on error.
- *
- *  \sa SDL_HapticOpen
- *  \sa SDL_HapticRumbleSupported
- *  \sa SDL_HapticRumblePlay
- *  \sa SDL_HapticRumbleStop
- */
-extern DECLSPEC int SDLCALL SDL_HapticRumbleInit(SDL_Haptic * haptic);
-
-/**
- *  \brief Runs simple rumble on a haptic device
- *
- *  \param haptic Haptic device to play rumble effect on.
- *  \param strength Strength of the rumble to play as a 0-1 float value.
- *  \param length Length of the rumble to play in milliseconds.
- *  \return 0 on success or -1 on error.
- *
- *  \sa SDL_HapticRumbleSupported
- *  \sa SDL_HapticRumbleInit
- *  \sa SDL_HapticRumbleStop
- */
-extern DECLSPEC int SDLCALL SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length );
-
-/**
- *  \brief Stops the simple rumble on a haptic device.
- *
- *  \param haptic Haptic to stop the rumble on.
- *  \return 0 on success or -1 on error.
- *
- *  \sa SDL_HapticRumbleSupported
- *  \sa SDL_HapticRumbleInit
- *  \sa SDL_HapticRumblePlay
- */
-extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_haptic_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_hints.h b/linux-x86/include/SDL2/SDL_hints.h
deleted file mode 100644
index b98ce68..0000000
--- a/linux-x86/include/SDL2/SDL_hints.h
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_hints.h
- *
- *  Official documentation for SDL configuration variables
- *
- *  This file contains functions to set and get configuration hints,
- *  as well as listing each of them alphabetically.
- *
- *  The convention for naming hints is SDL_HINT_X, where "SDL_X" is
- *  the environment variable that can be used to override the default.
- *
- *  In general these hints are just that - they may or may not be
- *  supported or applicable on any given platform, but they provide
- *  a way for an application or user to give the library a hint as
- *  to how they would like the library to work.
- */
-
-#ifndef _SDL_hints_h
-#define _SDL_hints_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \brief  A variable controlling how 3D acceleration is used to accelerate the SDL screen surface.
- *
- *  SDL can try to accelerate the SDL screen surface by using streaming
- *  textures with a 3D rendering engine.  This variable controls whether and
- *  how this is done.
- *
- *  This variable can be set to the following values:
- *    "0"       - Disable 3D acceleration
- *    "1"       - Enable 3D acceleration, using the default renderer.
- *    "X"       - Enable 3D acceleration, using X where X is one of the valid rendering drivers.  (e.g. "direct3d", "opengl", etc.)
- *
- *  By default SDL tries to make a best guess for each platform whether
- *  to use acceleration or not.
- */
-#define SDL_HINT_FRAMEBUFFER_ACCELERATION   "SDL_FRAMEBUFFER_ACCELERATION"
-
-/**
- *  \brief  A variable specifying which render driver to use.
- *
- *  If the application doesn't pick a specific renderer to use, this variable
- *  specifies the name of the preferred renderer.  If the preferred renderer
- *  can't be initialized, the normal default renderer is used.
- *
- *  This variable is case insensitive and can be set to the following values:
- *    "direct3d"
- *    "opengl"
- *    "opengles2"
- *    "opengles"
- *    "software"
- *
- *  The default varies by platform, but it's the first one in the list that
- *  is available on the current platform.
- */
-#define SDL_HINT_RENDER_DRIVER              "SDL_RENDER_DRIVER"
-
-/**
- *  \brief  A variable controlling whether the OpenGL render driver uses shaders if they are available.
- *
- *  This variable can be set to the following values:
- *    "0"       - Disable shaders
- *    "1"       - Enable shaders
- *
- *  By default shaders are used if OpenGL supports them.
- */
-#define SDL_HINT_RENDER_OPENGL_SHADERS      "SDL_RENDER_OPENGL_SHADERS"
-
-/**
- *  \brief  A variable controlling whether the Direct3D device is initialized for thread-safe operations.
- *
- *  This variable can be set to the following values:
- *    "0"       - Thread-safety is not enabled (faster)
- *    "1"       - Thread-safety is enabled
- *
- *  By default the Direct3D device is created with thread-safety disabled.
- */
-#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE"
-
-/**
- *  \brief  A variable controlling whether to enable Direct3D 11+'s Debug Layer.
- *
- *  This variable does not have any effect on the Direct3D 9 based renderer.
- *
- *  This variable can be set to the following values:
- *    "0"       - Disable Debug Layer use
- *    "1"       - Enable Debug Layer use
- *
- *  By default, SDL does not use Direct3D Debug Layer.
- */
-#define SDL_HINT_RENDER_DIRECT3D11_DEBUG    "SDL_HINT_RENDER_DIRECT3D11_DEBUG"
-
-/**
- *  \brief  A variable controlling the scaling quality
- *
- *  This variable can be set to the following values:
- *    "0" or "nearest" - Nearest pixel sampling
- *    "1" or "linear"  - Linear filtering (supported by OpenGL and Direct3D)
- *    "2" or "best"    - Currently this is the same as "linear"
- *
- *  By default nearest pixel sampling is used
- */
-#define SDL_HINT_RENDER_SCALE_QUALITY       "SDL_RENDER_SCALE_QUALITY"
-
-/**
- *  \brief  A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing.
- *
- *  This variable can be set to the following values:
- *    "0"       - Disable vsync
- *    "1"       - Enable vsync
- *
- *  By default SDL does not sync screen surface updates with vertical refresh.
- */
-#define SDL_HINT_RENDER_VSYNC               "SDL_RENDER_VSYNC"
-
-/**
- *  \brief  A variable controlling whether the screensaver is enabled. 
- *
- *  This variable can be set to the following values:
- *    "0"       - Disable screensaver
- *    "1"       - Enable screensaver
- *
- *  By default SDL will disable the screensaver.
- */
-#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER    "SDL_VIDEO_ALLOW_SCREENSAVER"
-
-/**
- *  \brief  A variable controlling whether the X11 VidMode extension should be used.
- *
- *  This variable can be set to the following values:
- *    "0"       - Disable XVidMode
- *    "1"       - Enable XVidMode
- *
- *  By default SDL will use XVidMode if it is available.
- */
-#define SDL_HINT_VIDEO_X11_XVIDMODE         "SDL_VIDEO_X11_XVIDMODE"
-
-/**
- *  \brief  A variable controlling whether the X11 Xinerama extension should be used.
- *
- *  This variable can be set to the following values:
- *    "0"       - Disable Xinerama
- *    "1"       - Enable Xinerama
- *
- *  By default SDL will use Xinerama if it is available.
- */
-#define SDL_HINT_VIDEO_X11_XINERAMA         "SDL_VIDEO_X11_XINERAMA"
-
-/**
- *  \brief  A variable controlling whether the X11 XRandR extension should be used.
- *
- *  This variable can be set to the following values:
- *    "0"       - Disable XRandR
- *    "1"       - Enable XRandR
- *
- *  By default SDL will not use XRandR because of window manager issues.
- */
-#define SDL_HINT_VIDEO_X11_XRANDR           "SDL_VIDEO_X11_XRANDR"
-
-/**
- *  \brief  A variable controlling whether grabbing input grabs the keyboard
- *
- *  This variable can be set to the following values:
- *    "0"       - Grab will affect only the mouse
- *    "1"       - Grab will affect mouse and keyboard
- *
- *  By default SDL will not grab the keyboard so system shortcuts still work.
- */
-#define SDL_HINT_GRAB_KEYBOARD              "SDL_GRAB_KEYBOARD"
-
-/**
-*  \brief  A variable controlling whether relative mouse mode is implemented using mouse warping
-*
-*  This variable can be set to the following values:
-*    "0"       - Relative mouse mode uses raw input
-*    "1"       - Relative mouse mode uses mouse warping
-*
-*  By default SDL will use raw input for relative mouse mode
-*/
-#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP    "SDL_MOUSE_RELATIVE_MODE_WARP"
-
-/**
- *  \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true.
- *
- */
-#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS   "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS"
-
-/**
- *  \brief  A variable controlling whether the idle timer is disabled on iOS.
- *
- *  When an iOS app does not receive touches for some time, the screen is
- *  dimmed automatically. For games where the accelerometer is the only input
- *  this is problematic. This functionality can be disabled by setting this
- *  hint.
- *
- *  This variable can be set to the following values:
- *    "0"       - Enable idle timer
- *    "1"       - Disable idle timer
- */
-#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED"
-
-/**
- *  \brief  A variable controlling which orientations are allowed on iOS.
- *
- *  In some circumstances it is necessary to be able to explicitly control
- *  which UI orientations are allowed.
- *
- *  This variable is a space delimited list of the following values:
- *    "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown"
- */
-#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS"
-    
-/**
- *  \brief  A variable controlling whether an Android built-in accelerometer should be
- *  listed as a joystick device, rather than listing actual joysticks only.
- *
- *  This variable can be set to the following values:
- *    "0"       - List only real joysticks and accept input from them
- *    "1"       - List real joysticks along with the accelerometer as if it were a 3 axis joystick (the default).
- */
-#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK"
-
-
-/**
- *  \brief  A variable that lets you disable the detection and use of Xinput gamepad devices
- *
- *  The variable can be set to the following values:
- *    "0"       - Disable XInput detection (only uses direct input)
- *    "1"       - Enable XInput detection (the default)
- */
-#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED"
-
-
-/**
- *  \brief  A variable that lets you manually hint extra gamecontroller db entries
- *
- *  The variable should be newline delimited rows of gamecontroller config data, see SDL_gamecontroller.h
- *
- *  This hint must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER)
- *  You can update mappings after the system is initialized with SDL_GameControllerMappingForGUID() and SDL_GameControllerAddMapping()
- */
-#define SDL_HINT_GAMECONTROLLERCONFIG "SDL_GAMECONTROLLERCONFIG"
-
-
-/**
- *  \brief  A variable that lets you enable joystick (and gamecontroller) events even when your app is in the background.
- *
- *  The variable can be set to the following values:
- *    "0"       - Disable joystick & gamecontroller input events when the
- *                application is in the background.
- *    "1"       - Enable joystick & gamecontroller input events when the
- *                application is in the background.
- *
- *  The default value is "0".  This hint may be set at any time.
- */
-#define SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS"
-
-
-/**
- *  \brief If set to 0 then never set the top most bit on a SDL Window, even if the video mode expects it.
- *      This is a debugging aid for developers and not expected to be used by end users. The default is "1"
- *
- *  This variable can be set to the following values:
- *    "0"       - don't allow topmost
- *    "1"       - allow topmost
- */
-#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST"
-
-
-/**
- *  \brief A variable that controls the timer resolution, in milliseconds.
- *
- *  The higher resolution the timer, the more frequently the CPU services
- *  timer interrupts, and the more precise delays are, but this takes up
- *  power and CPU time.  This hint is only used on Windows 7 and earlier.
- *
- *  See this blog post for more information:
- *  http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/
- *
- *  If this variable is set to "0", the system timer resolution is not set.
- *
- *  The default value is "1". This hint may be set at any time.
- */
-#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION"
-
-
-/**
- *  \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac)
- */
-#define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED"
-
-/**
- *  \brief A variable that determines whether ctrl+click should generate a right-click event on Mac
- *  
- *  If present, holding ctrl while left clicking will generate a right click
- *  event when on Mac.
- */
-#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK"
-
-/**
-*  \brief  A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries
-*
-*  SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It
-*  can use two different sets of binaries, those compiled by the user from source
-*  or those provided by the Chrome browser. In the later case, these binaries require
-*  that SDL loads a DLL providing the shader compiler.
-*
-*  This variable can be set to the following values:
-*    "d3dcompiler_46.dll" - default, best for Vista or later.
-*    "d3dcompiler_43.dll" - for XP support.
-*    "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries.
-*
-*/
-#define SDL_HINT_VIDEO_WIN_D3DCOMPILER              "SDL_VIDEO_WIN_D3DCOMPILER"
-
-/**
-*  \brief  A variable that is the address of another SDL_Window* (as a hex string formatted with "%p").
-*  
-*  If this hint is set before SDL_CreateWindowFrom() and the SDL_Window* it is set to has
-*  SDL_WINDOW_OPENGL set (and running on WGL only, currently), then two things will occur on the newly 
-*  created SDL_Window:
-*
-*  1. Its pixel format will be set to the same pixel format as this SDL_Window.  This is
-*  needed for example when sharing an OpenGL context across multiple windows.
-*
-*  2. The flag SDL_WINDOW_OPENGL will be set on the new window so it can be used for
-*  OpenGL rendering.
-*
-*  This variable can be set to the following values:
-*    The address (as a string "%p") of the SDL_Window* that new windows created with SDL_CreateWindowFrom() should
-*    share a pixel format with.
-*/
-#define SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT    "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT"
-
-/*
- *  \brief A URL to a WinRT app's privacy policy
- *
- *  All network-enabled WinRT apps must make a privacy policy available to its
- *  users.  On Windows 8, 8.1, and RT, Microsoft mandates that this policy be
- *  be available in the Windows Settings charm, as accessed from within the app.
- *  SDL provides code to add a URL-based link there, which can point to the app's
- *  privacy policy.
- *
- *  To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL
- *  before calling any SDL_Init functions.  The contents of the hint should
- *  be a valid URL.  For example, "http://www.example.com".
- *
- *  The default value is "", which will prevent SDL from adding a privacy policy
- *  link to the Settings charm.  This hint should only be set during app init.
- *
- *  The label text of an app's "Privacy Policy" link may be customized via another
- *  hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL.
- *
- *  Please note that on Windows Phone, Microsoft does not provide standard UI
- *  for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL
- *  will not get used on that platform.  Network-enabled phone apps should display
- *  their privacy policy through some other, in-app means.
- */
-#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_HINT_WINRT_PRIVACY_POLICY_URL"
-
-/** \brief Label text for a WinRT app's privacy policy link
- *
- *  Network-enabled WinRT apps must include a privacy policy.  On Windows 8, 8.1, and RT,
- *  Microsoft mandates that this policy be available via the Windows Settings charm.
- *  SDL provides code to add a link there, with it's label text being set via the
- *  optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL.
- *
- *  Please note that a privacy policy's contents are not set via this hint.  A separate
- *  hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the
- *  policy.
- *
- *  The contents of this hint should be encoded as a UTF8 string.
- *
- *  The default value is "Privacy Policy".  This hint should only be set during app
- *  initialization, preferably before any calls to SDL_Init.
- *
- *  For additional information on linking to a privacy policy, see the documentation for
- *  SDL_HINT_WINRT_PRIVACY_POLICY_URL.
- */
-#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_HINT_WINRT_PRIVACY_POLICY_LABEL"
-
-/** \brief If set to 1, back button press events on Windows Phone 8+ will be marked as handled.
- *
- *  TODO, WinRT: document SDL_HINT_WINRT_HANDLE_BACK_BUTTON need and use
- *  For now, more details on why this is needed can be found at the
- *  beginning of the following web page:
- *  http://msdn.microsoft.com/en-us/library/windowsphone/develop/jj247550(v=vs.105).aspx
- */
-#define SDL_HINT_WINRT_HANDLE_BACK_BUTTON "SDL_HINT_WINRT_HANDLE_BACK_BUTTON"
-
-/**
- *  \brief  A variable that dictates policy for fullscreen Spaces on Mac OS X.
- *
- *  This hint only applies to Mac OS X.
- *
- *  The variable can be set to the following values:
- *    "0"       - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and
- *                SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen"
- *                button on their titlebars).
- *    "1"       - Enable Spaces support (FULLSCREEN_DESKTOP will use them and
- *                SDL_WINDOW_RESIZABLE windows will offer the "fullscreen"
- *                button on their titlebars.
- *
- *  The default value is "1". Spaces are disabled regardless of this hint if
- *   the OS isn't at least Mac OS X Lion (10.7). This hint must be set before
- *   any windows are created.
- */
-#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES    "SDL_VIDEO_MAC_FULLSCREEN_SPACES"
-
-
-/**
- *  \brief  An enumeration of hint priorities
- */
-typedef enum
-{
-    SDL_HINT_DEFAULT,
-    SDL_HINT_NORMAL,
-    SDL_HINT_OVERRIDE
-} SDL_HintPriority;
-
-
-/**
- *  \brief Set a hint with a specific priority
- *
- *  The priority controls the behavior when setting a hint that already
- *  has a value.  Hints will replace existing hints of their priority and
- *  lower.  Environment variables are considered to have override priority.
- *
- *  \return SDL_TRUE if the hint was set, SDL_FALSE otherwise
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_SetHintWithPriority(const char *name,
-                                                         const char *value,
-                                                         SDL_HintPriority priority);
-
-/**
- *  \brief Set a hint with normal priority
- *
- *  \return SDL_TRUE if the hint was set, SDL_FALSE otherwise
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name,
-                                             const char *value);
-
-/**
- *  \brief Get a hint
- *
- *  \return The string value of a hint variable.
- */
-extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name);
-
-/**
- *  \brief Add a function to watch a particular hint
- *
- *  \param name The hint to watch
- *  \param callback The function to call when the hint value changes
- *  \param userdata A pointer to pass to the callback function
- */
-typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue);
-extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name,
-                                                 SDL_HintCallback callback,
-                                                 void *userdata);
-
-/**
- *  \brief Remove a function watching a particular hint
- *
- *  \param name The hint being watched
- *  \param callback The function being called when the hint value changes
- *  \param userdata A pointer being passed to the callback function
- */
-extern DECLSPEC void SDLCALL SDL_DelHintCallback(const char *name,
-                                                 SDL_HintCallback callback,
-                                                 void *userdata);
-
-/**
- *  \brief  Clear all hints
- *
- *  This function is called during SDL_Quit() to free stored hints.
- */
-extern DECLSPEC void SDLCALL SDL_ClearHints(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_hints_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_joystick.h b/linux-x86/include/SDL2/SDL_joystick.h
deleted file mode 100644
index b0b1c66..0000000
--- a/linux-x86/include/SDL2/SDL_joystick.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_joystick.h
- *
- *  Include file for SDL joystick event handling
- *
- * The term "device_index" identifies currently plugged in joystick devices between 0 and SDL_NumJoysticks, with the exact joystick
- *   behind a device_index changing as joysticks are plugged and unplugged.
- *
- * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted
- *   then it will get a new instance_id, instance_id's are monotonically increasing identifiers of a joystick plugged in.
- *
- * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of
- *   the device (a X360 wired controller for example). This identifier is platform dependent.
- *
- *
- */
-
-#ifndef _SDL_joystick_h
-#define _SDL_joystick_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \file SDL_joystick.h
- *
- *  In order to use these functions, SDL_Init() must have been called
- *  with the ::SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
- *  for joysticks, and load appropriate drivers.
- *
- *  If you would like to receive joystick updates while the application
- *  is in the background, you should set the following hint before calling
- *  SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS
- */
-
-/* The joystick structure used to identify an SDL joystick */
-struct _SDL_Joystick;
-typedef struct _SDL_Joystick SDL_Joystick;
-
-/* A structure that encodes the stable unique id for a joystick device */
-typedef struct {
-    Uint8 data[16];
-} SDL_JoystickGUID;
-
-typedef Sint32 SDL_JoystickID;
-
-
-/* Function prototypes */
-/**
- *  Count the number of joysticks attached to the system right now
- */
-extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);
-
-/**
- *  Get the implementation dependent name of a joystick.
- *  This can be called before any joysticks are opened.
- *  If no name can be found, this function returns NULL.
- */
-extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index);
-
-/**
- *  Open a joystick for use.
- *  The index passed as an argument refers tothe N'th joystick on the system.
- *  This index is the value which will identify this joystick in future joystick
- *  events.
- *
- *  \return A joystick identifier, or NULL if an error occurred.
- */
-extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index);
-
-/**
- *  Return the name for this currently opened joystick.
- *  If no name can be found, this function returns NULL.
- */
-extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick);
-
-/**
- *  Return the GUID for the joystick at this index
- */
-extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index);
-
-/**
- *  Return the GUID for this opened joystick
- */
-extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick);
-
-/**
- *  Return a string representation for this guid. pszGUID must point to at least 33 bytes
- *  (32 for the string plus a NULL terminator).
- */
-extern DECLSPEC void SDLCALL SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID);
-
-/**
- *  convert a string into a joystick formatted guid
- */
-extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID);
-
-/**
- *  Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick);
-
-/**
- *  Get the instance ID of an opened joystick or -1 if the joystick is invalid.
- */
-extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick * joystick);
-
-/**
- *  Get the number of general axis controls on a joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick);
-
-/**
- *  Get the number of trackballs on a joystick.
- *
- *  Joystick trackballs have only relative motion events associated
- *  with them and their state cannot be polled.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick);
-
-/**
- *  Get the number of POV hats on a joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick);
-
-/**
- *  Get the number of buttons on a joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick);
-
-/**
- *  Update the current state of the open joysticks.
- *
- *  This is called automatically by the event loop if any joystick
- *  events are enabled.
- */
-extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
-
-/**
- *  Enable/disable joystick event polling.
- *
- *  If joystick events are disabled, you must call SDL_JoystickUpdate()
- *  yourself and check the state of the joystick when you want joystick
- *  information.
- *
- *  The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
-
-/**
- *  Get the current state of an axis control on a joystick.
- *
- *  The state is a value ranging from -32768 to 32767.
- *
- *  The axis indices start at index 0.
- */
-extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
-                                                   int axis);
-
-/**
- *  \name Hat positions
- */
-/* @{ */
-#define SDL_HAT_CENTERED    0x00
-#define SDL_HAT_UP      0x01
-#define SDL_HAT_RIGHT       0x02
-#define SDL_HAT_DOWN        0x04
-#define SDL_HAT_LEFT        0x08
-#define SDL_HAT_RIGHTUP     (SDL_HAT_RIGHT|SDL_HAT_UP)
-#define SDL_HAT_RIGHTDOWN   (SDL_HAT_RIGHT|SDL_HAT_DOWN)
-#define SDL_HAT_LEFTUP      (SDL_HAT_LEFT|SDL_HAT_UP)
-#define SDL_HAT_LEFTDOWN    (SDL_HAT_LEFT|SDL_HAT_DOWN)
-/* @} */
-
-/**
- *  Get the current state of a POV hat on a joystick.
- *
- *  The hat indices start at index 0.
- *
- *  \return The return value is one of the following positions:
- *           - ::SDL_HAT_CENTERED
- *           - ::SDL_HAT_UP
- *           - ::SDL_HAT_RIGHT
- *           - ::SDL_HAT_DOWN
- *           - ::SDL_HAT_LEFT
- *           - ::SDL_HAT_RIGHTUP
- *           - ::SDL_HAT_RIGHTDOWN
- *           - ::SDL_HAT_LEFTUP
- *           - ::SDL_HAT_LEFTDOWN
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick,
-                                                 int hat);
-
-/**
- *  Get the ball axis change since the last poll.
- *
- *  \return 0, or -1 if you passed it invalid parameters.
- *
- *  The ball indices start at index 0.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick,
-                                                int ball, int *dx, int *dy);
-
-/**
- *  Get the current state of a button on a joystick.
- *
- *  The button indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick,
-                                                    int button);
-
-/**
- *  Close a joystick previously opened with SDL_JoystickOpen().
- */
-extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_joystick_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_keyboard.h b/linux-x86/include/SDL2/SDL_keyboard.h
deleted file mode 100644
index 586a26c..0000000
--- a/linux-x86/include/SDL2/SDL_keyboard.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_keyboard.h
- *
- *  Include file for SDL keyboard event handling
- */
-
-#ifndef _SDL_keyboard_h
-#define _SDL_keyboard_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_keycode.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \brief The SDL keysym structure, used in key events.
- *
- *  \note  If you are looking for translated character input, see the ::SDL_TEXTINPUT event.
- */
-typedef struct SDL_Keysym
-{
-    SDL_Scancode scancode;      /**< SDL physical key code - see ::SDL_Scancode for details */
-    SDL_Keycode sym;            /**< SDL virtual key code - see ::SDL_Keycode for details */
-    Uint16 mod;                 /**< current key modifiers */
-    Uint32 unused;
-} SDL_Keysym;
-
-/* Function prototypes */
-
-/**
- *  \brief Get the window which currently has keyboard focus.
- */
-extern DECLSPEC SDL_Window * SDLCALL SDL_GetKeyboardFocus(void);
-
-/**
- *  \brief Get a snapshot of the current state of the keyboard.
- *
- *  \param numkeys if non-NULL, receives the length of the returned array.
- *
- *  \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values.
- *
- *  \b Example:
- *  \code
- *  const Uint8 *state = SDL_GetKeyboardState(NULL);
- *  if ( state[SDL_SCANCODE_RETURN] )   {
- *      printf("<RETURN> is pressed.\n");
- *  }
- *  \endcode
- */
-extern DECLSPEC const Uint8 *SDLCALL SDL_GetKeyboardState(int *numkeys);
-
-/**
- *  \brief Get the current key modifier state for the keyboard.
- */
-extern DECLSPEC SDL_Keymod SDLCALL SDL_GetModState(void);
-
-/**
- *  \brief Set the current key modifier state for the keyboard.
- *
- *  \note This does not change the keyboard state, only the key modifier flags.
- */
-extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate);
-
-/**
- *  \brief Get the key code corresponding to the given scancode according
- *         to the current keyboard layout.
- *
- *  See ::SDL_Keycode for details.
- *
- *  \sa SDL_GetKeyName()
- */
-extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode);
-
-/**
- *  \brief Get the scancode corresponding to the given key code according to the
- *         current keyboard layout.
- *
- *  See ::SDL_Scancode for details.
- *
- *  \sa SDL_GetScancodeName()
- */
-extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key);
-
-/**
- *  \brief Get a human-readable name for a scancode.
- *
- *  \return A pointer to the name for the scancode.
- *          If the scancode doesn't have a name, this function returns
- *          an empty string ("").
- *
- *  \sa SDL_Scancode
- */
-extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode scancode);
-
-/**
- *  \brief Get a scancode from a human-readable name
- *
- *  \return scancode, or SDL_SCANCODE_UNKNOWN if the name wasn't recognized
- *
- *  \sa SDL_Scancode
- */
-extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromName(const char *name);
-
-/**
- *  \brief Get a human-readable name for a key.
- *
- *  \return A pointer to a UTF-8 string that stays valid at least until the next
- *          call to this function. If you need it around any longer, you must
- *          copy it.  If the key doesn't have a name, this function returns an
- *          empty string ("").
- *
- *  \sa SDL_Key
- */
-extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key);
-
-/**
- *  \brief Get a key code from a human-readable name
- *
- *  \return key code, or SDLK_UNKNOWN if the name wasn't recognized
- *
- *  \sa SDL_Keycode
- */
-extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name);
-
-/**
- *  \brief Start accepting Unicode text input events.
- *         This function will show the on-screen keyboard if supported.
- *
- *  \sa SDL_StopTextInput()
- *  \sa SDL_SetTextInputRect()
- *  \sa SDL_HasScreenKeyboardSupport()
- */
-extern DECLSPEC void SDLCALL SDL_StartTextInput(void);
-
-/**
- *  \brief Return whether or not Unicode text input events are enabled.
- *
- *  \sa SDL_StartTextInput()
- *  \sa SDL_StopTextInput()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputActive(void);
-
-/**
- *  \brief Stop receiving any text input events.
- *         This function will hide the on-screen keyboard if supported.
- *
- *  \sa SDL_StartTextInput()
- *  \sa SDL_HasScreenKeyboardSupport()
- */
-extern DECLSPEC void SDLCALL SDL_StopTextInput(void);
-
-/**
- *  \brief Set the rectangle used to type Unicode text inputs.
- *         This is used as a hint for IME and on-screen keyboard placement.
- *
- *  \sa SDL_StartTextInput()
- */
-extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect);
-
-/**
- *  \brief Returns whether the platform has some screen keyboard support.
- *
- *  \return SDL_TRUE if some keyboard support is available else SDL_FALSE.
- *
- *  \note Not all screen keyboard functions are supported on all platforms.
- *
- *  \sa SDL_IsScreenKeyboardShown()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void);
-
-/**
- *  \brief Returns whether the screen keyboard is shown for given window.
- *
- *  \param window The window for which screen keyboard should be queried.
- *
- *  \return SDL_TRUE if screen keyboard is shown else SDL_FALSE.
- *
- *  \sa SDL_HasScreenKeyboardSupport()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_keyboard_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_keycode.h b/linux-x86/include/SDL2/SDL_keycode.h
deleted file mode 100644
index d5f5dd0..0000000
--- a/linux-x86/include/SDL2/SDL_keycode.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_keycode.h
- *
- *  Defines constants which identify keyboard keys and modifiers.
- */
-
-#ifndef _SDL_keycode_h
-#define _SDL_keycode_h
-
-#include "SDL_stdinc.h"
-#include "SDL_scancode.h"
-
-/**
- *  \brief The SDL virtual key representation.
- *
- *  Values of this type are used to represent keyboard keys using the current
- *  layout of the keyboard.  These values include Unicode values representing
- *  the unmodified character that would be generated by pressing the key, or
- *  an SDLK_* constant for those keys that do not generate characters.
- */
-typedef Sint32 SDL_Keycode;
-
-#define SDLK_SCANCODE_MASK (1<<30)
-#define SDL_SCANCODE_TO_KEYCODE(X)  (X | SDLK_SCANCODE_MASK)
-
-enum
-{
-    SDLK_UNKNOWN = 0,
-
-    SDLK_RETURN = '\r',
-    SDLK_ESCAPE = '\033',
-    SDLK_BACKSPACE = '\b',
-    SDLK_TAB = '\t',
-    SDLK_SPACE = ' ',
-    SDLK_EXCLAIM = '!',
-    SDLK_QUOTEDBL = '"',
-    SDLK_HASH = '#',
-    SDLK_PERCENT = '%',
-    SDLK_DOLLAR = '$',
-    SDLK_AMPERSAND = '&',
-    SDLK_QUOTE = '\'',
-    SDLK_LEFTPAREN = '(',
-    SDLK_RIGHTPAREN = ')',
-    SDLK_ASTERISK = '*',
-    SDLK_PLUS = '+',
-    SDLK_COMMA = ',',
-    SDLK_MINUS = '-',
-    SDLK_PERIOD = '.',
-    SDLK_SLASH = '/',
-    SDLK_0 = '0',
-    SDLK_1 = '1',
-    SDLK_2 = '2',
-    SDLK_3 = '3',
-    SDLK_4 = '4',
-    SDLK_5 = '5',
-    SDLK_6 = '6',
-    SDLK_7 = '7',
-    SDLK_8 = '8',
-    SDLK_9 = '9',
-    SDLK_COLON = ':',
-    SDLK_SEMICOLON = ';',
-    SDLK_LESS = '<',
-    SDLK_EQUALS = '=',
-    SDLK_GREATER = '>',
-    SDLK_QUESTION = '?',
-    SDLK_AT = '@',
-    /*
-       Skip uppercase letters
-     */
-    SDLK_LEFTBRACKET = '[',
-    SDLK_BACKSLASH = '\\',
-    SDLK_RIGHTBRACKET = ']',
-    SDLK_CARET = '^',
-    SDLK_UNDERSCORE = '_',
-    SDLK_BACKQUOTE = '`',
-    SDLK_a = 'a',
-    SDLK_b = 'b',
-    SDLK_c = 'c',
-    SDLK_d = 'd',
-    SDLK_e = 'e',
-    SDLK_f = 'f',
-    SDLK_g = 'g',
-    SDLK_h = 'h',
-    SDLK_i = 'i',
-    SDLK_j = 'j',
-    SDLK_k = 'k',
-    SDLK_l = 'l',
-    SDLK_m = 'm',
-    SDLK_n = 'n',
-    SDLK_o = 'o',
-    SDLK_p = 'p',
-    SDLK_q = 'q',
-    SDLK_r = 'r',
-    SDLK_s = 's',
-    SDLK_t = 't',
-    SDLK_u = 'u',
-    SDLK_v = 'v',
-    SDLK_w = 'w',
-    SDLK_x = 'x',
-    SDLK_y = 'y',
-    SDLK_z = 'z',
-
-    SDLK_CAPSLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK),
-
-    SDLK_F1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1),
-    SDLK_F2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2),
-    SDLK_F3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3),
-    SDLK_F4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4),
-    SDLK_F5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5),
-    SDLK_F6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6),
-    SDLK_F7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7),
-    SDLK_F8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8),
-    SDLK_F9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9),
-    SDLK_F10 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10),
-    SDLK_F11 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11),
-    SDLK_F12 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12),
-
-    SDLK_PRINTSCREEN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN),
-    SDLK_SCROLLLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK),
-    SDLK_PAUSE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE),
-    SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT),
-    SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME),
-    SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP),
-    SDLK_DELETE = '\177',
-    SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END),
-    SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN),
-    SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT),
-    SDLK_LEFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT),
-    SDLK_DOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN),
-    SDLK_UP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP),
-
-    SDLK_NUMLOCKCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR),
-    SDLK_KP_DIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE),
-    SDLK_KP_MULTIPLY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY),
-    SDLK_KP_MINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS),
-    SDLK_KP_PLUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS),
-    SDLK_KP_ENTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER),
-    SDLK_KP_1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1),
-    SDLK_KP_2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2),
-    SDLK_KP_3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3),
-    SDLK_KP_4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4),
-    SDLK_KP_5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5),
-    SDLK_KP_6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6),
-    SDLK_KP_7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7),
-    SDLK_KP_8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8),
-    SDLK_KP_9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9),
-    SDLK_KP_0 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0),
-    SDLK_KP_PERIOD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD),
-
-    SDLK_APPLICATION = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION),
-    SDLK_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER),
-    SDLK_KP_EQUALS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS),
-    SDLK_F13 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13),
-    SDLK_F14 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14),
-    SDLK_F15 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15),
-    SDLK_F16 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16),
-    SDLK_F17 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17),
-    SDLK_F18 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18),
-    SDLK_F19 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19),
-    SDLK_F20 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20),
-    SDLK_F21 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21),
-    SDLK_F22 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22),
-    SDLK_F23 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23),
-    SDLK_F24 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24),
-    SDLK_EXECUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE),
-    SDLK_HELP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP),
-    SDLK_MENU = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU),
-    SDLK_SELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT),
-    SDLK_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP),
-    SDLK_AGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN),
-    SDLK_UNDO = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO),
-    SDLK_CUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT),
-    SDLK_COPY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY),
-    SDLK_PASTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE),
-    SDLK_FIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND),
-    SDLK_MUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE),
-    SDLK_VOLUMEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP),
-    SDLK_VOLUMEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN),
-    SDLK_KP_COMMA = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA),
-    SDLK_KP_EQUALSAS400 =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400),
-
-    SDLK_ALTERASE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE),
-    SDLK_SYSREQ = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ),
-    SDLK_CANCEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL),
-    SDLK_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR),
-    SDLK_PRIOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR),
-    SDLK_RETURN2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2),
-    SDLK_SEPARATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR),
-    SDLK_OUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT),
-    SDLK_OPER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER),
-    SDLK_CLEARAGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN),
-    SDLK_CRSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL),
-    SDLK_EXSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL),
-
-    SDLK_KP_00 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00),
-    SDLK_KP_000 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000),
-    SDLK_THOUSANDSSEPARATOR =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR),
-    SDLK_DECIMALSEPARATOR =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR),
-    SDLK_CURRENCYUNIT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT),
-    SDLK_CURRENCYSUBUNIT =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT),
-    SDLK_KP_LEFTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN),
-    SDLK_KP_RIGHTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN),
-    SDLK_KP_LEFTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE),
-    SDLK_KP_RIGHTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE),
-    SDLK_KP_TAB = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB),
-    SDLK_KP_BACKSPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE),
-    SDLK_KP_A = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A),
-    SDLK_KP_B = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B),
-    SDLK_KP_C = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C),
-    SDLK_KP_D = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D),
-    SDLK_KP_E = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E),
-    SDLK_KP_F = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F),
-    SDLK_KP_XOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR),
-    SDLK_KP_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER),
-    SDLK_KP_PERCENT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT),
-    SDLK_KP_LESS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS),
-    SDLK_KP_GREATER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER),
-    SDLK_KP_AMPERSAND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND),
-    SDLK_KP_DBLAMPERSAND =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND),
-    SDLK_KP_VERTICALBAR =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR),
-    SDLK_KP_DBLVERTICALBAR =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR),
-    SDLK_KP_COLON = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON),
-    SDLK_KP_HASH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH),
-    SDLK_KP_SPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE),
-    SDLK_KP_AT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT),
-    SDLK_KP_EXCLAM = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM),
-    SDLK_KP_MEMSTORE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE),
-    SDLK_KP_MEMRECALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL),
-    SDLK_KP_MEMCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR),
-    SDLK_KP_MEMADD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD),
-    SDLK_KP_MEMSUBTRACT =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT),
-    SDLK_KP_MEMMULTIPLY =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY),
-    SDLK_KP_MEMDIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE),
-    SDLK_KP_PLUSMINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS),
-    SDLK_KP_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR),
-    SDLK_KP_CLEARENTRY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY),
-    SDLK_KP_BINARY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY),
-    SDLK_KP_OCTAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL),
-    SDLK_KP_DECIMAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL),
-    SDLK_KP_HEXADECIMAL =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL),
-
-    SDLK_LCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL),
-    SDLK_LSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT),
-    SDLK_LALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT),
-    SDLK_LGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI),
-    SDLK_RCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL),
-    SDLK_RSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT),
-    SDLK_RALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT),
-    SDLK_RGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI),
-
-    SDLK_MODE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE),
-
-    SDLK_AUDIONEXT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT),
-    SDLK_AUDIOPREV = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV),
-    SDLK_AUDIOSTOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP),
-    SDLK_AUDIOPLAY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY),
-    SDLK_AUDIOMUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE),
-    SDLK_MEDIASELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT),
-    SDLK_WWW = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW),
-    SDLK_MAIL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL),
-    SDLK_CALCULATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR),
-    SDLK_COMPUTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER),
-    SDLK_AC_SEARCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH),
-    SDLK_AC_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME),
-    SDLK_AC_BACK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK),
-    SDLK_AC_FORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD),
-    SDLK_AC_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP),
-    SDLK_AC_REFRESH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH),
-    SDLK_AC_BOOKMARKS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS),
-
-    SDLK_BRIGHTNESSDOWN =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN),
-    SDLK_BRIGHTNESSUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP),
-    SDLK_DISPLAYSWITCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH),
-    SDLK_KBDILLUMTOGGLE =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE),
-    SDLK_KBDILLUMDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN),
-    SDLK_KBDILLUMUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP),
-    SDLK_EJECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT),
-    SDLK_SLEEP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP)
-};
-
-/**
- * \brief Enumeration of valid key mods (possibly OR'd together).
- */
-typedef enum
-{
-    KMOD_NONE = 0x0000,
-    KMOD_LSHIFT = 0x0001,
-    KMOD_RSHIFT = 0x0002,
-    KMOD_LCTRL = 0x0040,
-    KMOD_RCTRL = 0x0080,
-    KMOD_LALT = 0x0100,
-    KMOD_RALT = 0x0200,
-    KMOD_LGUI = 0x0400,
-    KMOD_RGUI = 0x0800,
-    KMOD_NUM = 0x1000,
-    KMOD_CAPS = 0x2000,
-    KMOD_MODE = 0x4000,
-    KMOD_RESERVED = 0x8000
-} SDL_Keymod;
-
-#define KMOD_CTRL   (KMOD_LCTRL|KMOD_RCTRL)
-#define KMOD_SHIFT  (KMOD_LSHIFT|KMOD_RSHIFT)
-#define KMOD_ALT    (KMOD_LALT|KMOD_RALT)
-#define KMOD_GUI    (KMOD_LGUI|KMOD_RGUI)
-
-#endif /* _SDL_keycode_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_loadso.h b/linux-x86/include/SDL2/SDL_loadso.h
deleted file mode 100644
index 0359eae..0000000
--- a/linux-x86/include/SDL2/SDL_loadso.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_loadso.h
- *
- *  System dependent library loading routines
- *
- *  Some things to keep in mind:
- *  \li These functions only work on C function names.  Other languages may
- *      have name mangling and intrinsic language support that varies from
- *      compiler to compiler.
- *  \li Make sure you declare your function pointers with the same calling
- *      convention as the actual library function.  Your code will crash
- *      mysteriously if you do not do this.
- *  \li Avoid namespace collisions.  If you load a symbol from the library,
- *      it is not defined whether or not it goes into the global symbol
- *      namespace for the application.  If it does and it conflicts with
- *      symbols in your code or other shared libraries, you will not get
- *      the results you expect. :)
- */
-
-#ifndef _SDL_loadso_h
-#define _SDL_loadso_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  This function dynamically loads a shared object and returns a pointer
- *  to the object handle (or NULL if there was an error).
- *  The 'sofile' parameter is a system dependent name of the object file.
- */
-extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile);
-
-/**
- *  Given an object handle, this function looks up the address of the
- *  named function in the shared object and returns it.  This address
- *  is no longer valid after calling SDL_UnloadObject().
- */
-extern DECLSPEC void *SDLCALL SDL_LoadFunction(void *handle,
-                                               const char *name);
-
-/**
- *  Unload a shared object from memory.
- */
-extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_loadso_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_log.h b/linux-x86/include/SDL2/SDL_log.h
deleted file mode 100644
index 5c2bca5..0000000
--- a/linux-x86/include/SDL2/SDL_log.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_log.h
- *
- *  Simple log messages with categories and priorities.
- *
- *  By default logs are quiet, but if you're debugging SDL you might want:
- *
- *      SDL_LogSetAllPriority(SDL_LOG_PRIORITY_WARN);
- *
- *  Here's where the messages go on different platforms:
- *      Windows: debug output stream
- *      Android: log output
- *      Others: standard error output (stderr)
- */
-
-#ifndef _SDL_log_h
-#define _SDL_log_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**
- *  \brief The maximum size of a log message
- *
- *  Messages longer than the maximum size will be truncated
- */
-#define SDL_MAX_LOG_MESSAGE 4096
-
-/**
- *  \brief The predefined log categories
- *
- *  By default the application category is enabled at the INFO level,
- *  the assert category is enabled at the WARN level, test is enabled
- *  at the VERBOSE level and all other categories are enabled at the
- *  CRITICAL level.
- */
-enum
-{
-    SDL_LOG_CATEGORY_APPLICATION,
-    SDL_LOG_CATEGORY_ERROR,
-    SDL_LOG_CATEGORY_ASSERT,
-    SDL_LOG_CATEGORY_SYSTEM,
-    SDL_LOG_CATEGORY_AUDIO,
-    SDL_LOG_CATEGORY_VIDEO,
-    SDL_LOG_CATEGORY_RENDER,
-    SDL_LOG_CATEGORY_INPUT,
-    SDL_LOG_CATEGORY_TEST,
-
-    /* Reserved for future SDL library use */
-    SDL_LOG_CATEGORY_RESERVED1,
-    SDL_LOG_CATEGORY_RESERVED2,
-    SDL_LOG_CATEGORY_RESERVED3,
-    SDL_LOG_CATEGORY_RESERVED4,
-    SDL_LOG_CATEGORY_RESERVED5,
-    SDL_LOG_CATEGORY_RESERVED6,
-    SDL_LOG_CATEGORY_RESERVED7,
-    SDL_LOG_CATEGORY_RESERVED8,
-    SDL_LOG_CATEGORY_RESERVED9,
-    SDL_LOG_CATEGORY_RESERVED10,
-
-    /* Beyond this point is reserved for application use, e.g.
-       enum {
-           MYAPP_CATEGORY_AWESOME1 = SDL_LOG_CATEGORY_CUSTOM,
-           MYAPP_CATEGORY_AWESOME2,
-           MYAPP_CATEGORY_AWESOME3,
-           ...
-       };
-     */
-    SDL_LOG_CATEGORY_CUSTOM
-};
-
-/**
- *  \brief The predefined log priorities
- */
-typedef enum
-{
-    SDL_LOG_PRIORITY_VERBOSE = 1,
-    SDL_LOG_PRIORITY_DEBUG,
-    SDL_LOG_PRIORITY_INFO,
-    SDL_LOG_PRIORITY_WARN,
-    SDL_LOG_PRIORITY_ERROR,
-    SDL_LOG_PRIORITY_CRITICAL,
-    SDL_NUM_LOG_PRIORITIES
-} SDL_LogPriority;
-
-
-/**
- *  \brief Set the priority of all log categories
- */
-extern DECLSPEC void SDLCALL SDL_LogSetAllPriority(SDL_LogPriority priority);
-
-/**
- *  \brief Set the priority of a particular log category
- */
-extern DECLSPEC void SDLCALL SDL_LogSetPriority(int category,
-                                                SDL_LogPriority priority);
-
-/**
- *  \brief Get the priority of a particular log category
- */
-extern DECLSPEC SDL_LogPriority SDLCALL SDL_LogGetPriority(int category);
-
-/**
- *  \brief Reset all priorities to default.
- *
- *  \note This is called in SDL_Quit().
- */
-extern DECLSPEC void SDLCALL SDL_LogResetPriorities(void);
-
-/**
- *  \brief Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO
- */
-extern DECLSPEC void SDLCALL SDL_Log(const char *fmt, ...);
-
-/**
- *  \brief Log a message with SDL_LOG_PRIORITY_VERBOSE
- */
-extern DECLSPEC void SDLCALL SDL_LogVerbose(int category, const char *fmt, ...);
-
-/**
- *  \brief Log a message with SDL_LOG_PRIORITY_DEBUG
- */
-extern DECLSPEC void SDLCALL SDL_LogDebug(int category, const char *fmt, ...);
-
-/**
- *  \brief Log a message with SDL_LOG_PRIORITY_INFO
- */
-extern DECLSPEC void SDLCALL SDL_LogInfo(int category, const char *fmt, ...);
-
-/**
- *  \brief Log a message with SDL_LOG_PRIORITY_WARN
- */
-extern DECLSPEC void SDLCALL SDL_LogWarn(int category, const char *fmt, ...);
-
-/**
- *  \brief Log a message with SDL_LOG_PRIORITY_ERROR
- */
-extern DECLSPEC void SDLCALL SDL_LogError(int category, const char *fmt, ...);
-
-/**
- *  \brief Log a message with SDL_LOG_PRIORITY_CRITICAL
- */
-extern DECLSPEC void SDLCALL SDL_LogCritical(int category, const char *fmt, ...);
-
-/**
- *  \brief Log a message with the specified category and priority.
- */
-extern DECLSPEC void SDLCALL SDL_LogMessage(int category,
-                                            SDL_LogPriority priority,
-                                            const char *fmt, ...);
-
-/**
- *  \brief Log a message with the specified category and priority.
- */
-extern DECLSPEC void SDLCALL SDL_LogMessageV(int category,
-                                             SDL_LogPriority priority,
-                                             const char *fmt, va_list ap);
-
-/**
- *  \brief The prototype for the log output function
- */
-typedef void (*SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message);
-
-/**
- *  \brief Get the current log output function.
- */
-extern DECLSPEC void SDLCALL SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata);
-
-/**
- *  \brief This function allows you to replace the default log output
- *         function with one of your own.
- */
-extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_log_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_main.h b/linux-x86/include/SDL2/SDL_main.h
deleted file mode 100644
index 2e8fae9..0000000
--- a/linux-x86/include/SDL2/SDL_main.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_main_h
-#define _SDL_main_h
-
-#include "SDL_stdinc.h"
-
-/**
- *  \file SDL_main.h
- *
- *  Redefine main() on some platforms so that it is called by SDL.
- */
-
-#ifndef SDL_MAIN_HANDLED
-#if defined(__WIN32__)
-/* On Windows SDL provides WinMain(), which parses the command line and passes
-   the arguments to your main function.
-
-   If you provide your own WinMain(), you may define SDL_MAIN_HANDLED
- */
-#define SDL_MAIN_AVAILABLE
-
-#elif defined(__WINRT__)
-/* On WinRT, SDL provides a main function that initializes CoreApplication,
-   creating an instance of IFrameworkView in the process.
-
-   Please note that #include'ing SDL_main.h is not enough to get a main()
-   function working.  In non-XAML apps, the file,
-   src/main/winrt/SDL_WinRT_main_NonXAML.cpp, or a copy of it, must be compiled
-   into the app itself.  In XAML apps, the function, SDL_WinRTRunApp must be
-   called, with a pointer to the Direct3D-hosted XAML control passed in.
-*/
-#define SDL_MAIN_NEEDED
-
-#elif defined(__IPHONEOS__)
-/* On iOS SDL provides a main function that creates an application delegate
-   and starts the iOS application run loop.
-
-   See src/video/uikit/SDL_uikitappdelegate.m for more details.
- */
-#define SDL_MAIN_NEEDED
-
-#elif defined(__ANDROID__)
-/* On Android SDL provides a Java class in SDLActivity.java that is the
-   main activity entry point.
-
-   See README-android.txt for more details on extending that class.
- */
-#define SDL_MAIN_NEEDED
-
-#endif
-#endif /* SDL_MAIN_HANDLED */
-
-#ifdef __cplusplus
-#define C_LINKAGE   "C"
-#else
-#define C_LINKAGE
-#endif /* __cplusplus */
-
-/**
- *  \file SDL_main.h
- *
- *  The application's main() function must be called with C linkage,
- *  and should be declared like this:
- *  \code
- *  #ifdef __cplusplus
- *  extern "C"
- *  #endif
- *  int main(int argc, char *argv[])
- *  {
- *  }
- *  \endcode
- */
-
-#if defined(SDL_MAIN_NEEDED) || defined(SDL_MAIN_AVAILABLE)
-#define main    SDL_main
-#endif
-
-/**
- *  The prototype for the application's main() function
- */
-extern C_LINKAGE int SDL_main(int argc, char *argv[]);
-
-
-#include "begin_code.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  This is called by the real SDL main function to let the rest of the
- *  library know that initialization was done properly.
- *
- *  Calling this yourself without knowing what you're doing can cause
- *  crashes and hard to diagnose problems with your application.
- */
-extern DECLSPEC void SDLCALL SDL_SetMainReady(void);
-
-#ifdef __WIN32__
-
-/**
- *  This can be called to set the application class at startup
- */
-extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style,
-                                            void *hInst);
-extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
-
-#endif /* __WIN32__ */
-
-
-#ifdef __WINRT__
-
-/**
- *  \brief Initializes and launches an SDL/WinRT application.
- *
- *  \param mainFunction The SDL app's C-style main().
- *  \param xamlBackgroundPanel An optional, XAML-based, background panel.
- *     For Non-XAML apps, this value must be set to NULL.  For XAML apps,
- *     pass in a pointer to a SwapChainBackgroundPanel, casted to an
- *     IInspectable (via reinterpret_cast).
- *  \ret 0 on success, -1 on failure.  On failure, use SDL_GetError to retrieve more
- *      information on the failure.
- */
-extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), void * xamlBackgroundPanel);
-
-#endif /* __WINRT__ */
-
-
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_main_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_messagebox.h b/linux-x86/include/SDL2/SDL_messagebox.h
deleted file mode 100644
index 6004da0..0000000
--- a/linux-x86/include/SDL2/SDL_messagebox.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_messagebox_h
-#define _SDL_messagebox_h
-
-#include "SDL_stdinc.h"
-#include "SDL_video.h"      /* For SDL_Window */
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief SDL_MessageBox flags. If supported will display warning icon, etc.
- */
-typedef enum
-{
-    SDL_MESSAGEBOX_ERROR        = 0x00000010,   /**< error dialog */
-    SDL_MESSAGEBOX_WARNING      = 0x00000020,   /**< warning dialog */
-    SDL_MESSAGEBOX_INFORMATION  = 0x00000040    /**< informational dialog */
-} SDL_MessageBoxFlags;
-
-/**
- * \brief Flags for SDL_MessageBoxButtonData.
- */
-typedef enum
-{
-    SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT = 0x00000001,  /**< Marks the default button when return is hit */
-    SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT = 0x00000002   /**< Marks the default button when escape is hit */
-} SDL_MessageBoxButtonFlags;
-
-/**
- *  \brief Individual button data.
- */
-typedef struct
-{
-    Uint32 flags;       /**< ::SDL_MessageBoxButtonFlags */
-    int buttonid;       /**< User defined button id (value returned via SDL_ShowMessageBox) */
-    const char * text;  /**< The UTF-8 button text */
-} SDL_MessageBoxButtonData;
-
-/**
- * \brief RGB value used in a message box color scheme
- */
-typedef struct
-{
-    Uint8 r, g, b;
-} SDL_MessageBoxColor;
-
-typedef enum
-{
-    SDL_MESSAGEBOX_COLOR_BACKGROUND,
-    SDL_MESSAGEBOX_COLOR_TEXT,
-    SDL_MESSAGEBOX_COLOR_BUTTON_BORDER,
-    SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND,
-    SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED,
-    SDL_MESSAGEBOX_COLOR_MAX
-} SDL_MessageBoxColorType;
-
-/**
- * \brief A set of colors to use for message box dialogs
- */
-typedef struct
-{
-    SDL_MessageBoxColor colors[SDL_MESSAGEBOX_COLOR_MAX];
-} SDL_MessageBoxColorScheme;
-
-/**
- *  \brief MessageBox structure containing title, text, window, etc.
- */
-typedef struct
-{
-    Uint32 flags;                       /**< ::SDL_MessageBoxFlags */
-    SDL_Window *window;                 /**< Parent window, can be NULL */
-    const char *title;                  /**< UTF-8 title */
-    const char *message;                /**< UTF-8 message text */
-
-    int numbuttons;
-    const SDL_MessageBoxButtonData *buttons;
-
-    const SDL_MessageBoxColorScheme *colorScheme;   /**< ::SDL_MessageBoxColorScheme, can be NULL to use system settings */
-} SDL_MessageBoxData;
-
-/**
- *  \brief Create a modal message box.
- *
- *  \param messageboxdata The SDL_MessageBoxData structure with title, text, etc.
- *  \param buttonid The pointer to which user id of hit button should be copied.
- *
- *  \return -1 on error, otherwise 0 and buttonid contains user id of button
- *          hit or -1 if dialog was closed.
- *
- *  \note This function should be called on the thread that created the parent
- *        window, or on the main thread if the messagebox has no parent.  It will
- *        block execution of that thread until the user clicks a button or
- *        closes the messagebox.
- */
-extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
-
-/**
- *  \brief Create a simple modal message box
- *
- *  \param flags    ::SDL_MessageBoxFlags
- *  \param title    UTF-8 title text
- *  \param message  UTF-8 message text
- *  \param window   The parent window, or NULL for no parent
- *
- *  \return 0 on success, -1 on error
- *
- *  \sa SDL_ShowMessageBox
- */
-extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_messagebox_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_mouse.h b/linux-x86/include/SDL2/SDL_mouse.h
deleted file mode 100644
index ebfd18f..0000000
--- a/linux-x86/include/SDL2/SDL_mouse.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_mouse.h
- *
- *  Include file for SDL mouse event handling.
- */
-
-#ifndef _SDL_mouse_h
-#define _SDL_mouse_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct SDL_Cursor SDL_Cursor;   /* Implementation dependent */
-
-/**
- * \brief Cursor types for SDL_CreateSystemCursor.
- */
-typedef enum
-{
-    SDL_SYSTEM_CURSOR_ARROW,     /**< Arrow */
-    SDL_SYSTEM_CURSOR_IBEAM,     /**< I-beam */
-    SDL_SYSTEM_CURSOR_WAIT,      /**< Wait */
-    SDL_SYSTEM_CURSOR_CROSSHAIR, /**< Crosshair */
-    SDL_SYSTEM_CURSOR_WAITARROW, /**< Small wait cursor (or Wait if not available) */
-    SDL_SYSTEM_CURSOR_SIZENWSE,  /**< Double arrow pointing northwest and southeast */
-    SDL_SYSTEM_CURSOR_SIZENESW,  /**< Double arrow pointing northeast and southwest */
-    SDL_SYSTEM_CURSOR_SIZEWE,    /**< Double arrow pointing west and east */
-    SDL_SYSTEM_CURSOR_SIZENS,    /**< Double arrow pointing north and south */
-    SDL_SYSTEM_CURSOR_SIZEALL,   /**< Four pointed arrow pointing north, south, east, and west */
-    SDL_SYSTEM_CURSOR_NO,        /**< Slashed circle or crossbones */
-    SDL_SYSTEM_CURSOR_HAND,      /**< Hand */
-    SDL_NUM_SYSTEM_CURSORS
-} SDL_SystemCursor;
-
-/* Function prototypes */
-
-/**
- *  \brief Get the window which currently has mouse focus.
- */
-extern DECLSPEC SDL_Window * SDLCALL SDL_GetMouseFocus(void);
-
-/**
- *  \brief Retrieve the current state of the mouse.
- *
- *  The current button state is returned as a button bitmask, which can
- *  be tested using the SDL_BUTTON(X) macros, and x and y are set to the
- *  mouse cursor position relative to the focus window for the currently
- *  selected mouse.  You can pass NULL for either x or y.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetMouseState(int *x, int *y);
-
-/**
- *  \brief Retrieve the relative state of the mouse.
- *
- *  The current button state is returned as a button bitmask, which can
- *  be tested using the SDL_BUTTON(X) macros, and x and y are set to the
- *  mouse deltas since the last call to SDL_GetRelativeMouseState().
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetRelativeMouseState(int *x, int *y);
-
-/**
- *  \brief Moves the mouse to the given position within the window.
- *
- *  \param window The window to move the mouse into, or NULL for the current mouse focus
- *  \param x The x coordinate within the window
- *  \param y The y coordinate within the window
- *
- *  \note This function generates a mouse motion event
- */
-extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_Window * window,
-                                                   int x, int y);
-
-/**
- *  \brief Set relative mouse mode.
- *
- *  \param enabled Whether or not to enable relative mode
- *
- *  \return 0 on success, or -1 if relative mode is not supported.
- *
- *  While the mouse is in relative mode, the cursor is hidden, and the
- *  driver will try to report continuous motion in the current window.
- *  Only relative motion events will be delivered, the mouse position
- *  will not change.
- *
- *  \note This function will flush any pending mouse motion.
- *
- *  \sa SDL_GetRelativeMouseMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(SDL_bool enabled);
-
-/**
- *  \brief Query whether relative mouse mode is enabled.
- *
- *  \sa SDL_SetRelativeMouseMode()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(void);
-
-/**
- *  \brief Create a cursor, using the specified bitmap data and
- *         mask (in MSB format).
- *
- *  The cursor width must be a multiple of 8 bits.
- *
- *  The cursor is created in black and white according to the following:
- *  <table>
- *  <tr><td> data </td><td> mask </td><td> resulting pixel on screen </td></tr>
- *  <tr><td>  0   </td><td>  1   </td><td> White </td></tr>
- *  <tr><td>  1   </td><td>  1   </td><td> Black </td></tr>
- *  <tr><td>  0   </td><td>  0   </td><td> Transparent </td></tr>
- *  <tr><td>  1   </td><td>  0   </td><td> Inverted color if possible, black
- *                                         if not. </td></tr>
- *  </table>
- *
- *  \sa SDL_FreeCursor()
- */
-extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data,
-                                                     const Uint8 * mask,
-                                                     int w, int h, int hot_x,
-                                                     int hot_y);
-
-/**
- *  \brief Create a color cursor.
- *
- *  \sa SDL_FreeCursor()
- */
-extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateColorCursor(SDL_Surface *surface,
-                                                          int hot_x,
-                                                          int hot_y);
-
-/**
- *  \brief Create a system cursor.
- *
- *  \sa SDL_FreeCursor()
- */
-extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateSystemCursor(SDL_SystemCursor id);
-
-/**
- *  \brief Set the active cursor.
- */
-extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor * cursor);
-
-/**
- *  \brief Return the active cursor.
- */
-extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void);
-
-/**
- *  \brief Return the default cursor.
- */
-extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetDefaultCursor(void);
-
-/**
- *  \brief Frees a cursor created with SDL_CreateCursor().
- *
- *  \sa SDL_CreateCursor()
- */
-extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor);
-
-/**
- *  \brief Toggle whether or not the cursor is shown.
- *
- *  \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current
- *                state.
- *
- *  \return 1 if the cursor is shown, or 0 if the cursor is hidden.
- */
-extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
-
-/**
- *  Used as a mask when testing buttons in buttonstate.
- *   - Button 1:  Left mouse button
- *   - Button 2:  Middle mouse button
- *   - Button 3:  Right mouse button
- */
-#define SDL_BUTTON(X)       (1 << ((X)-1))
-#define SDL_BUTTON_LEFT     1
-#define SDL_BUTTON_MIDDLE   2
-#define SDL_BUTTON_RIGHT    3
-#define SDL_BUTTON_X1       4
-#define SDL_BUTTON_X2       5
-#define SDL_BUTTON_LMASK    SDL_BUTTON(SDL_BUTTON_LEFT)
-#define SDL_BUTTON_MMASK    SDL_BUTTON(SDL_BUTTON_MIDDLE)
-#define SDL_BUTTON_RMASK    SDL_BUTTON(SDL_BUTTON_RIGHT)
-#define SDL_BUTTON_X1MASK   SDL_BUTTON(SDL_BUTTON_X1)
-#define SDL_BUTTON_X2MASK   SDL_BUTTON(SDL_BUTTON_X2)
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mouse_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_mutex.h b/linux-x86/include/SDL2/SDL_mutex.h
deleted file mode 100644
index 3e8b4db..0000000
--- a/linux-x86/include/SDL2/SDL_mutex.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_mutex_h
-#define _SDL_mutex_h
-
-/**
- *  \file SDL_mutex.h
- *
- *  Functions to provide thread synchronization primitives.
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  Synchronization functions which can time out return this value
- *  if they time out.
- */
-#define SDL_MUTEX_TIMEDOUT  1
-
-/**
- *  This is the timeout value which corresponds to never time out.
- */
-#define SDL_MUTEX_MAXWAIT   (~(Uint32)0)
-
-
-/**
- *  \name Mutex functions
- */
-/* @{ */
-
-/* The SDL mutex structure, defined in SDL_sysmutex.c */
-struct SDL_mutex;
-typedef struct SDL_mutex SDL_mutex;
-
-/**
- *  Create a mutex, initialized unlocked.
- */
-extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex(void);
-
-/**
- *  Lock the mutex.
- *
- *  \return 0, or -1 on error.
- */
-#define SDL_mutexP(m)   SDL_LockMutex(m)
-extern DECLSPEC int SDLCALL SDL_LockMutex(SDL_mutex * mutex);
-
-/**
- *  Try to lock the mutex
- *
- *  \return 0, SDL_MUTEX_TIMEDOUT, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_TryLockMutex(SDL_mutex * mutex);
-
-/**
- *  Unlock the mutex.
- *
- *  \return 0, or -1 on error.
- *
- *  \warning It is an error to unlock a mutex that has not been locked by
- *           the current thread, and doing so results in undefined behavior.
- */
-#define SDL_mutexV(m)   SDL_UnlockMutex(m)
-extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex);
-
-/**
- *  Destroy a mutex.
- */
-extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex);
-
-/* @} *//* Mutex functions */
-
-
-/**
- *  \name Semaphore functions
- */
-/* @{ */
-
-/* The SDL semaphore structure, defined in SDL_syssem.c */
-struct SDL_semaphore;
-typedef struct SDL_semaphore SDL_sem;
-
-/**
- *  Create a semaphore, initialized with value, returns NULL on failure.
- */
-extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore(Uint32 initial_value);
-
-/**
- *  Destroy a semaphore.
- */
-extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem);
-
-/**
- *  This function suspends the calling thread until the semaphore pointed
- *  to by \c sem has a positive count. It then atomically decreases the
- *  semaphore count.
- */
-extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem);
-
-/**
- *  Non-blocking variant of SDL_SemWait().
- *
- *  \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would
- *          block, and -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem);
-
-/**
- *  Variant of SDL_SemWait() with a timeout in milliseconds.
- *
- *  \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not
- *          succeed in the allotted time, and -1 on error.
- *
- *  \warning On some platforms this function is implemented by looping with a
- *           delay of 1 ms, and so should be avoided if possible.
- */
-extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms);
-
-/**
- *  Atomically increases the semaphore's count (not blocking).
- *
- *  \return 0, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem);
-
-/**
- *  Returns the current count of the semaphore.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem);
-
-/* @} *//* Semaphore functions */
-
-
-/**
- *  \name Condition variable functions
- */
-/* @{ */
-
-/* The SDL condition variable structure, defined in SDL_syscond.c */
-struct SDL_cond;
-typedef struct SDL_cond SDL_cond;
-
-/**
- *  Create a condition variable.
- *
- *  Typical use of condition variables:
- *
- *  Thread A:
- *    SDL_LockMutex(lock);
- *    while ( ! condition ) {
- *        SDL_CondWait(cond, lock);
- *    }
- *    SDL_UnlockMutex(lock);
- *
- *  Thread B:
- *    SDL_LockMutex(lock);
- *    ...
- *    condition = true;
- *    ...
- *    SDL_CondSignal(cond);
- *    SDL_UnlockMutex(lock);
- *
- *  There is some discussion whether to signal the condition variable
- *  with the mutex locked or not.  There is some potential performance
- *  benefit to unlocking first on some platforms, but there are some
- *  potential race conditions depending on how your code is structured.
- *
- *  In general it's safer to signal the condition variable while the
- *  mutex is locked.
- */
-extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond(void);
-
-/**
- *  Destroy a condition variable.
- */
-extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond * cond);
-
-/**
- *  Restart one of the threads that are waiting on the condition variable.
- *
- *  \return 0 or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond);
-
-/**
- *  Restart all threads that are waiting on the condition variable.
- *
- *  \return 0 or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond * cond);
-
-/**
- *  Wait on the condition variable, unlocking the provided mutex.
- *
- *  \warning The mutex must be locked before entering this function!
- *
- *  The mutex is re-locked once the condition variable is signaled.
- *
- *  \return 0 when it is signaled, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex);
-
-/**
- *  Waits for at most \c ms milliseconds, and returns 0 if the condition
- *  variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not
- *  signaled in the allotted time, and -1 on error.
- *
- *  \warning On some platforms this function is implemented by looping with a
- *           delay of 1 ms, and so should be avoided if possible.
- */
-extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond,
-                                                SDL_mutex * mutex, Uint32 ms);
-
-/* @} *//* Condition variable functions */
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mutex_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_name.h b/linux-x86/include/SDL2/SDL_name.h
deleted file mode 100644
index 719666f..0000000
--- a/linux-x86/include/SDL2/SDL_name.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDLname_h_
-#define _SDLname_h_
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define NeedFunctionPrototypes 1
-#endif
-
-#define SDL_NAME(X) SDL_##X
-
-#endif /* _SDLname_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_opengl.h b/linux-x86/include/SDL2/SDL_opengl.h
deleted file mode 100644
index b48ea7a..0000000
--- a/linux-x86/include/SDL2/SDL_opengl.h
+++ /dev/null
@@ -1,11126 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_opengl.h
- *
- *  This is a simple file to encapsulate the OpenGL API headers.
- */
-
-#ifndef _SDL_opengl_h
-#define _SDL_opengl_h
-
-#include "SDL_config.h"
-
-#ifndef __IPHONEOS__
-
-#ifdef __WIN32__
-#define WIN32_LEAN_AND_MEAN
-#ifndef NOMINMAX
-#define NOMINMAX                /* Don't defined min() and max() */
-#endif
-#include <windows.h>
-#endif
-
-#ifdef __glext_h_
-/* Someone has already included glext.h */
-#define NO_SDL_GLEXT
-#endif
-#ifndef NO_SDL_GLEXT
-#define __glext_h_              /* Don't let gl.h include glext.h */
-#endif
-#if defined(__MACOSX__)
-#include <OpenGL/gl.h>          /* Header File For The OpenGL Library */
-#define __X_GL_H
-#else
-#include <GL/gl.h>              /* Header File For The OpenGL Library */
-#endif
-#ifndef NO_SDL_GLEXT
-#undef __glext_h_
-#endif
-
-/**
- *  \file SDL_opengl.h
- *
- *  This file is included because glext.h is not available on some systems.
- *  If you don't want this version included, simply define ::NO_SDL_GLEXT.
- *
- *  The latest version is available from:
- *      http://www.opengl.org/registry/
- */
-
-/**
- *  \def NO_SDL_GLEXT
- *
- *  Define this if you have your own version of glext.h and want to disable the
- *  version included in SDL_opengl.h.
- */
-
-#if !defined(NO_SDL_GLEXT) && !defined(GL_GLEXT_LEGACY)
-#ifndef __glext_h_
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007-2010 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated $Date: 2010-08-03 01:30:25 -0700 (Tue, 03 Aug 2010) $ */
-/* Current version at http://www.opengl.org/registry/ */
-#define GL_GLEXT_VERSION 64
-/* Function declaration macros - to move into glplatform.h */
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_VERSION_1_2_DEPRECATED
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#endif
-
-#ifndef GL_ARB_imaging_DEPRECATED
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
-#define GL_CONVOLUTION_BORDER_MODE        0x8013
-#define GL_CONVOLUTION_FILTER_SCALE       0x8014
-#define GL_CONVOLUTION_FILTER_BIAS        0x8015
-#define GL_REDUCE                         0x8016
-#define GL_CONVOLUTION_FORMAT             0x8017
-#define GL_CONVOLUTION_WIDTH              0x8018
-#define GL_CONVOLUTION_HEIGHT             0x8019
-#define GL_MAX_CONVOLUTION_WIDTH          0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
-#define GL_HISTOGRAM_WIDTH                0x8026
-#define GL_HISTOGRAM_FORMAT               0x8027
-#define GL_HISTOGRAM_RED_SIZE             0x8028
-#define GL_HISTOGRAM_GREEN_SIZE           0x8029
-#define GL_HISTOGRAM_BLUE_SIZE            0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
-#define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
-#define GL_MINMAX_FORMAT                  0x802F
-#define GL_MINMAX_SINK                    0x8030
-#define GL_TABLE_TOO_LARGE                0x8031
-#define GL_COLOR_MATRIX                   0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE              0x80D6
-#define GL_COLOR_TABLE_BIAS               0x80D7
-#define GL_COLOR_TABLE_FORMAT             0x80D8
-#define GL_COLOR_TABLE_WIDTH              0x80D9
-#define GL_COLOR_TABLE_RED_SIZE           0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
-#define GL_CONSTANT_BORDER                0x8151
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#endif
-
-#ifndef GL_VERSION_1_3_DEPRECATED
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#define GL_MULTISAMPLE_BIT                0x20000000
-#define GL_NORMAL_MAP                     0x8511
-#define GL_REFLECTION_MAP                 0x8512
-#define GL_COMPRESSED_ALPHA               0x84E9
-#define GL_COMPRESSED_LUMINANCE           0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
-#define GL_COMPRESSED_INTENSITY           0x84EC
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_SOURCE0_RGB                    0x8580
-#define GL_SOURCE1_RGB                    0x8581
-#define GL_SOURCE2_RGB                    0x8582
-#define GL_SOURCE0_ALPHA                  0x8588
-#define GL_SOURCE1_ALPHA                  0x8589
-#define GL_SOURCE2_ALPHA                  0x858A
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_SUBTRACT                       0x84E7
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#endif
-
-#ifndef GL_VERSION_1_4_DEPRECATED
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_GENERATE_MIPMAP                0x8191
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_FOG_COORDINATE_SOURCE          0x8450
-#define GL_FOG_COORDINATE                 0x8451
-#define GL_FRAGMENT_DEPTH                 0x8452
-#define GL_CURRENT_FOG_COORDINATE         0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
-#define GL_FOG_COORDINATE_ARRAY           0x8457
-#define GL_COLOR_SUM                      0x8458
-#define GL_CURRENT_SECONDARY_COLOR        0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
-#define GL_SECONDARY_COLOR_ARRAY          0x845E
-#define GL_TEXTURE_FILTER_CONTROL         0x8500
-#define GL_DEPTH_TEXTURE_MODE             0x884B
-#define GL_COMPARE_R_TO_TEXTURE           0x884E
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#endif
-
-#ifndef GL_VERSION_1_5_DEPRECATED
-#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
-#define GL_FOG_COORD_SRC                  0x8450
-#define GL_FOG_COORD                      0x8451
-#define GL_CURRENT_FOG_COORD              0x8453
-#define GL_FOG_COORD_ARRAY_TYPE           0x8454
-#define GL_FOG_COORD_ARRAY_STRIDE         0x8455
-#define GL_FOG_COORD_ARRAY_POINTER        0x8456
-#define GL_FOG_COORD_ARRAY                0x8457
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D
-#define GL_SRC0_RGB                       0x8580
-#define GL_SRC1_RGB                       0x8581
-#define GL_SRC2_RGB                       0x8582
-#define GL_SRC0_ALPHA                     0x8588
-#define GL_SRC1_ALPHA                     0x8589
-#define GL_SRC2_ALPHA                     0x858A
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             0x8009
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_VERSION_2_0_DEPRECATED
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_PIXEL_PACK_BUFFER              0x88EB
-#define GL_PIXEL_UNPACK_BUFFER            0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
-#define GL_FLOAT_MAT2x3                   0x8B65
-#define GL_FLOAT_MAT2x4                   0x8B66
-#define GL_FLOAT_MAT3x2                   0x8B67
-#define GL_FLOAT_MAT3x4                   0x8B68
-#define GL_FLOAT_MAT4x2                   0x8B69
-#define GL_FLOAT_MAT4x3                   0x8B6A
-#define GL_SRGB                           0x8C40
-#define GL_SRGB8                          0x8C41
-#define GL_SRGB_ALPHA                     0x8C42
-#define GL_SRGB8_ALPHA8                   0x8C43
-#define GL_COMPRESSED_SRGB                0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
-#endif
-
-#ifndef GL_VERSION_2_1_DEPRECATED
-#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
-#define GL_SLUMINANCE_ALPHA               0x8C44
-#define GL_SLUMINANCE8_ALPHA8             0x8C45
-#define GL_SLUMINANCE                     0x8C46
-#define GL_SLUMINANCE8                    0x8C47
-#define GL_COMPRESSED_SLUMINANCE          0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
-#endif
-
-#ifndef GL_VERSION_3_0
-#define GL_COMPARE_REF_TO_TEXTURE         0x884E
-#define GL_CLIP_DISTANCE0                 0x3000
-#define GL_CLIP_DISTANCE1                 0x3001
-#define GL_CLIP_DISTANCE2                 0x3002
-#define GL_CLIP_DISTANCE3                 0x3003
-#define GL_CLIP_DISTANCE4                 0x3004
-#define GL_CLIP_DISTANCE5                 0x3005
-#define GL_CLIP_DISTANCE6                 0x3006
-#define GL_CLIP_DISTANCE7                 0x3007
-#define GL_MAX_CLIP_DISTANCES             0x0D32
-#define GL_MAJOR_VERSION                  0x821B
-#define GL_MINOR_VERSION                  0x821C
-#define GL_NUM_EXTENSIONS                 0x821D
-#define GL_CONTEXT_FLAGS                  0x821E
-#define GL_DEPTH_BUFFER                   0x8223
-#define GL_STENCIL_BUFFER                 0x8224
-#define GL_COMPRESSED_RED                 0x8225
-#define GL_COMPRESSED_RG                  0x8226
-#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
-#define GL_RGBA32F                        0x8814
-#define GL_RGB32F                         0x8815
-#define GL_RGBA16F                        0x881A
-#define GL_RGB16F                         0x881B
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
-#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
-#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
-#define GL_CLAMP_READ_COLOR               0x891C
-#define GL_FIXED_ONLY                     0x891D
-#define GL_MAX_VARYING_COMPONENTS         0x8B4B
-#define GL_TEXTURE_1D_ARRAY               0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
-#define GL_TEXTURE_2D_ARRAY               0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
-#define GL_R11F_G11F_B10F                 0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
-#define GL_RGB9_E5                        0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
-#define GL_TEXTURE_SHARED_SIZE            0x8C3F
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
-#define GL_PRIMITIVES_GENERATED           0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
-#define GL_RASTERIZER_DISCARD             0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS            0x8C8C
-#define GL_SEPARATE_ATTRIBS               0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
-#define GL_RGBA32UI                       0x8D70
-#define GL_RGB32UI                        0x8D71
-#define GL_RGBA16UI                       0x8D76
-#define GL_RGB16UI                        0x8D77
-#define GL_RGBA8UI                        0x8D7C
-#define GL_RGB8UI                         0x8D7D
-#define GL_RGBA32I                        0x8D82
-#define GL_RGB32I                         0x8D83
-#define GL_RGBA16I                        0x8D88
-#define GL_RGB16I                         0x8D89
-#define GL_RGBA8I                         0x8D8E
-#define GL_RGB8I                          0x8D8F
-#define GL_RED_INTEGER                    0x8D94
-#define GL_GREEN_INTEGER                  0x8D95
-#define GL_BLUE_INTEGER                   0x8D96
-#define GL_RGB_INTEGER                    0x8D98
-#define GL_RGBA_INTEGER                   0x8D99
-#define GL_BGR_INTEGER                    0x8D9A
-#define GL_BGRA_INTEGER                   0x8D9B
-#define GL_SAMPLER_1D_ARRAY               0x8DC0
-#define GL_SAMPLER_2D_ARRAY               0x8DC1
-#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
-#define GL_UNSIGNED_INT_VEC2              0x8DC6
-#define GL_UNSIGNED_INT_VEC3              0x8DC7
-#define GL_UNSIGNED_INT_VEC4              0x8DC8
-#define GL_INT_SAMPLER_1D                 0x8DC9
-#define GL_INT_SAMPLER_2D                 0x8DCA
-#define GL_INT_SAMPLER_3D                 0x8DCB
-#define GL_INT_SAMPLER_CUBE               0x8DCC
-#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
-#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
-#define GL_QUERY_WAIT                     0x8E13
-#define GL_QUERY_NO_WAIT                  0x8E14
-#define GL_QUERY_BY_REGION_WAIT           0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
-#define GL_BUFFER_ACCESS_FLAGS            0x911F
-#define GL_BUFFER_MAP_LENGTH              0x9120
-#define GL_BUFFER_MAP_OFFSET              0x9121
-/* Reuse tokens from ARB_depth_buffer_float */
-/* reuse GL_DEPTH_COMPONENT32F */
-/* reuse GL_DEPTH32F_STENCIL8 */
-/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
-/* Reuse tokens from ARB_framebuffer_object */
-/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-/* reuse GL_FRAMEBUFFER_DEFAULT */
-/* reuse GL_FRAMEBUFFER_UNDEFINED */
-/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
-/* reuse GL_INDEX */
-/* reuse GL_MAX_RENDERBUFFER_SIZE */
-/* reuse GL_DEPTH_STENCIL */
-/* reuse GL_UNSIGNED_INT_24_8 */
-/* reuse GL_DEPTH24_STENCIL8 */
-/* reuse GL_TEXTURE_STENCIL_SIZE */
-/* reuse GL_TEXTURE_RED_TYPE */
-/* reuse GL_TEXTURE_GREEN_TYPE */
-/* reuse GL_TEXTURE_BLUE_TYPE */
-/* reuse GL_TEXTURE_ALPHA_TYPE */
-/* reuse GL_TEXTURE_DEPTH_TYPE */
-/* reuse GL_UNSIGNED_NORMALIZED */
-/* reuse GL_FRAMEBUFFER_BINDING */
-/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
-/* reuse GL_RENDERBUFFER_BINDING */
-/* reuse GL_READ_FRAMEBUFFER */
-/* reuse GL_DRAW_FRAMEBUFFER */
-/* reuse GL_READ_FRAMEBUFFER_BINDING */
-/* reuse GL_RENDERBUFFER_SAMPLES */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-/* reuse GL_FRAMEBUFFER_COMPLETE */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
-/* reuse GL_MAX_COLOR_ATTACHMENTS */
-/* reuse GL_COLOR_ATTACHMENT0 */
-/* reuse GL_COLOR_ATTACHMENT1 */
-/* reuse GL_COLOR_ATTACHMENT2 */
-/* reuse GL_COLOR_ATTACHMENT3 */
-/* reuse GL_COLOR_ATTACHMENT4 */
-/* reuse GL_COLOR_ATTACHMENT5 */
-/* reuse GL_COLOR_ATTACHMENT6 */
-/* reuse GL_COLOR_ATTACHMENT7 */
-/* reuse GL_COLOR_ATTACHMENT8 */
-/* reuse GL_COLOR_ATTACHMENT9 */
-/* reuse GL_COLOR_ATTACHMENT10 */
-/* reuse GL_COLOR_ATTACHMENT11 */
-/* reuse GL_COLOR_ATTACHMENT12 */
-/* reuse GL_COLOR_ATTACHMENT13 */
-/* reuse GL_COLOR_ATTACHMENT14 */
-/* reuse GL_COLOR_ATTACHMENT15 */
-/* reuse GL_DEPTH_ATTACHMENT */
-/* reuse GL_STENCIL_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER */
-/* reuse GL_RENDERBUFFER */
-/* reuse GL_RENDERBUFFER_WIDTH */
-/* reuse GL_RENDERBUFFER_HEIGHT */
-/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
-/* reuse GL_STENCIL_INDEX1 */
-/* reuse GL_STENCIL_INDEX4 */
-/* reuse GL_STENCIL_INDEX8 */
-/* reuse GL_STENCIL_INDEX16 */
-/* reuse GL_RENDERBUFFER_RED_SIZE */
-/* reuse GL_RENDERBUFFER_GREEN_SIZE */
-/* reuse GL_RENDERBUFFER_BLUE_SIZE */
-/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
-/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
-/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-/* reuse GL_MAX_SAMPLES */
-/* Reuse tokens from ARB_framebuffer_sRGB */
-/* reuse GL_FRAMEBUFFER_SRGB */
-/* Reuse tokens from ARB_half_float_vertex */
-/* reuse GL_HALF_FLOAT */
-/* Reuse tokens from ARB_map_buffer_range */
-/* reuse GL_MAP_READ_BIT */
-/* reuse GL_MAP_WRITE_BIT */
-/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
-/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
-/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
-/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
-/* Reuse tokens from ARB_texture_compression_rgtc */
-/* reuse GL_COMPRESSED_RED_RGTC1 */
-/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
-/* reuse GL_COMPRESSED_RG_RGTC2 */
-/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
-/* Reuse tokens from ARB_texture_rg */
-/* reuse GL_RG */
-/* reuse GL_RG_INTEGER */
-/* reuse GL_R8 */
-/* reuse GL_R16 */
-/* reuse GL_RG8 */
-/* reuse GL_RG16 */
-/* reuse GL_R16F */
-/* reuse GL_R32F */
-/* reuse GL_RG16F */
-/* reuse GL_RG32F */
-/* reuse GL_R8I */
-/* reuse GL_R8UI */
-/* reuse GL_R16I */
-/* reuse GL_R16UI */
-/* reuse GL_R32I */
-/* reuse GL_R32UI */
-/* reuse GL_RG8I */
-/* reuse GL_RG8UI */
-/* reuse GL_RG16I */
-/* reuse GL_RG16UI */
-/* reuse GL_RG32I */
-/* reuse GL_RG32UI */
-/* Reuse tokens from ARB_vertex_array_object */
-/* reuse GL_VERTEX_ARRAY_BINDING */
-#endif
-
-#ifndef GL_VERSION_3_0_DEPRECATED
-#define GL_CLAMP_VERTEX_COLOR             0x891A
-#define GL_CLAMP_FRAGMENT_COLOR           0x891B
-#define GL_ALPHA_INTEGER                  0x8D97
-/* Reuse tokens from ARB_framebuffer_object */
-/* reuse GL_TEXTURE_LUMINANCE_TYPE */
-/* reuse GL_TEXTURE_INTENSITY_TYPE */
-#endif
-
-#ifndef GL_VERSION_3_1
-#define GL_SAMPLER_2D_RECT                0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
-#define GL_SAMPLER_BUFFER                 0x8DC2
-#define GL_INT_SAMPLER_2D_RECT            0x8DCD
-#define GL_INT_SAMPLER_BUFFER             0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
-#define GL_TEXTURE_BUFFER                 0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT          0x8C2E
-#define GL_TEXTURE_RECTANGLE              0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
-#define GL_RED_SNORM                      0x8F90
-#define GL_RG_SNORM                       0x8F91
-#define GL_RGB_SNORM                      0x8F92
-#define GL_RGBA_SNORM                     0x8F93
-#define GL_R8_SNORM                       0x8F94
-#define GL_RG8_SNORM                      0x8F95
-#define GL_RGB8_SNORM                     0x8F96
-#define GL_RGBA8_SNORM                    0x8F97
-#define GL_R16_SNORM                      0x8F98
-#define GL_RG16_SNORM                     0x8F99
-#define GL_RGB16_SNORM                    0x8F9A
-#define GL_RGBA16_SNORM                   0x8F9B
-#define GL_SIGNED_NORMALIZED              0x8F9C
-#define GL_PRIMITIVE_RESTART              0x8F9D
-#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
-/* Reuse tokens from ARB_copy_buffer */
-/* reuse GL_COPY_READ_BUFFER */
-/* reuse GL_COPY_WRITE_BUFFER */
-/* Reuse tokens from ARB_draw_instanced (none) */
-/* Reuse tokens from ARB_uniform_buffer_object */
-/* reuse GL_UNIFORM_BUFFER */
-/* reuse GL_UNIFORM_BUFFER_BINDING */
-/* reuse GL_UNIFORM_BUFFER_START */
-/* reuse GL_UNIFORM_BUFFER_SIZE */
-/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */
-/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */
-/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */
-/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */
-/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */
-/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */
-/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */
-/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */
-/* reuse GL_ACTIVE_UNIFORM_BLOCKS */
-/* reuse GL_UNIFORM_TYPE */
-/* reuse GL_UNIFORM_SIZE */
-/* reuse GL_UNIFORM_NAME_LENGTH */
-/* reuse GL_UNIFORM_BLOCK_INDEX */
-/* reuse GL_UNIFORM_OFFSET */
-/* reuse GL_UNIFORM_ARRAY_STRIDE */
-/* reuse GL_UNIFORM_MATRIX_STRIDE */
-/* reuse GL_UNIFORM_IS_ROW_MAJOR */
-/* reuse GL_UNIFORM_BLOCK_BINDING */
-/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */
-/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */
-/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */
-/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */
-/* reuse GL_INVALID_INDEX */
-#endif
-
-#ifndef GL_VERSION_3_2
-#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
-#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
-#define GL_LINES_ADJACENCY                0x000A
-#define GL_LINE_STRIP_ADJACENCY           0x000B
-#define GL_TRIANGLES_ADJACENCY            0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY       0x000D
-#define GL_PROGRAM_POINT_SIZE             0x8642
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
-#define GL_GEOMETRY_SHADER                0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT          0x8916
-#define GL_GEOMETRY_INPUT_TYPE            0x8917
-#define GL_GEOMETRY_OUTPUT_TYPE           0x8918
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES   0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
-#define GL_MAX_VERTEX_OUTPUT_COMPONENTS   0x9122
-#define GL_MAX_GEOMETRY_INPUT_COMPONENTS  0x9123
-#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
-#define GL_MAX_FRAGMENT_INPUT_COMPONENTS  0x9125
-#define GL_CONTEXT_PROFILE_MASK           0x9126
-/* reuse GL_MAX_VARYING_COMPONENTS */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-/* Reuse tokens from ARB_depth_clamp */
-/* reuse GL_DEPTH_CLAMP */
-/* Reuse tokens from ARB_draw_elements_base_vertex (none) */
-/* Reuse tokens from ARB_fragment_coord_conventions (none) */
-/* Reuse tokens from ARB_provoking_vertex */
-/* reuse GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-/* reuse GL_FIRST_VERTEX_CONVENTION */
-/* reuse GL_LAST_VERTEX_CONVENTION */
-/* reuse GL_PROVOKING_VERTEX */
-/* Reuse tokens from ARB_seamless_cube_map */
-/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS */
-/* Reuse tokens from ARB_sync */
-/* reuse GL_MAX_SERVER_WAIT_TIMEOUT */
-/* reuse GL_OBJECT_TYPE */
-/* reuse GL_SYNC_CONDITION */
-/* reuse GL_SYNC_STATUS */
-/* reuse GL_SYNC_FLAGS */
-/* reuse GL_SYNC_FENCE */
-/* reuse GL_SYNC_GPU_COMMANDS_COMPLETE */
-/* reuse GL_UNSIGNALED */
-/* reuse GL_SIGNALED */
-/* reuse GL_ALREADY_SIGNALED */
-/* reuse GL_TIMEOUT_EXPIRED */
-/* reuse GL_CONDITION_SATISFIED */
-/* reuse GL_WAIT_FAILED */
-/* reuse GL_TIMEOUT_IGNORED */
-/* reuse GL_SYNC_FLUSH_COMMANDS_BIT */
-/* reuse GL_TIMEOUT_IGNORED */
-/* Reuse tokens from ARB_texture_multisample */
-/* reuse GL_SAMPLE_POSITION */
-/* reuse GL_SAMPLE_MASK */
-/* reuse GL_SAMPLE_MASK_VALUE */
-/* reuse GL_MAX_SAMPLE_MASK_WORDS */
-/* reuse GL_TEXTURE_2D_MULTISAMPLE */
-/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE */
-/* reuse GL_TEXTURE_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE */
-/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_TEXTURE_SAMPLES */
-/* reuse GL_TEXTURE_FIXED_SAMPLE_LOCATIONS */
-/* reuse GL_SAMPLER_2D_MULTISAMPLE */
-/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE */
-/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE */
-/* reuse GL_SAMPLER_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
-/* reuse GL_MAX_COLOR_TEXTURE_SAMPLES */
-/* reuse GL_MAX_DEPTH_TEXTURE_SAMPLES */
-/* reuse GL_MAX_INTEGER_SAMPLES */
-/* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */
-#endif
-
-#ifndef GL_VERSION_3_3
-#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR    0x88FE
-/* Reuse tokens from ARB_blend_func_extended */
-/* reuse GL_SRC1_COLOR */
-/* reuse GL_ONE_MINUS_SRC1_COLOR */
-/* reuse GL_ONE_MINUS_SRC1_ALPHA */
-/* reuse GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */
-/* Reuse tokens from ARB_explicit_attrib_location (none) */
-/* Reuse tokens from ARB_occlusion_query2 */
-/* reuse GL_ANY_SAMPLES_PASSED */
-/* Reuse tokens from ARB_sampler_objects */
-/* reuse GL_SAMPLER_BINDING */
-/* Reuse tokens from ARB_shader_bit_encoding (none) */
-/* Reuse tokens from ARB_texture_rgb10_a2ui */
-/* reuse GL_RGB10_A2UI */
-/* Reuse tokens from ARB_texture_swizzle */
-/* reuse GL_TEXTURE_SWIZZLE_R */
-/* reuse GL_TEXTURE_SWIZZLE_G */
-/* reuse GL_TEXTURE_SWIZZLE_B */
-/* reuse GL_TEXTURE_SWIZZLE_A */
-/* reuse GL_TEXTURE_SWIZZLE_RGBA */
-/* Reuse tokens from ARB_timer_query */
-/* reuse GL_TIME_ELAPSED */
-/* reuse GL_TIMESTAMP */
-/* Reuse tokens from ARB_vertex_type_2_10_10_10_rev */
-/* reuse GL_INT_2_10_10_10_REV */
-#endif
-
-#ifndef GL_VERSION_4_0
-#define GL_SAMPLE_SHADING                 0x8C36
-#define GL_MIN_SAMPLE_SHADING_VALUE       0x8C37
-#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E
-#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F
-#define GL_TEXTURE_CUBE_MAP_ARRAY         0x9009
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY   0x900B
-#define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
-#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D
-#define GL_INT_SAMPLER_CUBE_MAP_ARRAY     0x900E
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
-/* Reuse tokens from ARB_texture_query_lod (none) */
-/* Reuse tokens from ARB_draw_buffers_blend (none) */
-/* Reuse tokens from ARB_draw_indirect */
-/* reuse GL_DRAW_INDIRECT_BUFFER */
-/* reuse GL_DRAW_INDIRECT_BUFFER_BINDING */
-/* Reuse tokens from ARB_gpu_shader5 */
-/* reuse GL_GEOMETRY_SHADER_INVOCATIONS */
-/* reuse GL_MAX_GEOMETRY_SHADER_INVOCATIONS */
-/* reuse GL_MIN_FRAGMENT_INTERPOLATION_OFFSET */
-/* reuse GL_MAX_FRAGMENT_INTERPOLATION_OFFSET */
-/* reuse GL_FRAGMENT_INTERPOLATION_OFFSET_BITS */
-/* reuse GL_MAX_VERTEX_STREAMS */
-/* Reuse tokens from ARB_gpu_shader_fp64 */
-/* reuse GL_DOUBLE_VEC2 */
-/* reuse GL_DOUBLE_VEC3 */
-/* reuse GL_DOUBLE_VEC4 */
-/* reuse GL_DOUBLE_MAT2 */
-/* reuse GL_DOUBLE_MAT3 */
-/* reuse GL_DOUBLE_MAT4 */
-/* reuse GL_DOUBLE_MAT2x3 */
-/* reuse GL_DOUBLE_MAT2x4 */
-/* reuse GL_DOUBLE_MAT3x2 */
-/* reuse GL_DOUBLE_MAT3x4 */
-/* reuse GL_DOUBLE_MAT4x2 */
-/* reuse GL_DOUBLE_MAT4x3 */
-/* Reuse tokens from ARB_shader_subroutine */
-/* reuse GL_ACTIVE_SUBROUTINES */
-/* reuse GL_ACTIVE_SUBROUTINE_UNIFORMS */
-/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS */
-/* reuse GL_ACTIVE_SUBROUTINE_MAX_LENGTH */
-/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH */
-/* reuse GL_MAX_SUBROUTINES */
-/* reuse GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS */
-/* reuse GL_NUM_COMPATIBLE_SUBROUTINES */
-/* reuse GL_COMPATIBLE_SUBROUTINES */
-/* Reuse tokens from ARB_tessellation_shader */
-/* reuse GL_PATCHES */
-/* reuse GL_PATCH_VERTICES */
-/* reuse GL_PATCH_DEFAULT_INNER_LEVEL */
-/* reuse GL_PATCH_DEFAULT_OUTER_LEVEL */
-/* reuse GL_TESS_CONTROL_OUTPUT_VERTICES */
-/* reuse GL_TESS_GEN_MODE */
-/* reuse GL_TESS_GEN_SPACING */
-/* reuse GL_TESS_GEN_VERTEX_ORDER */
-/* reuse GL_TESS_GEN_POINT_MODE */
-/* reuse GL_ISOLINES */
-/* reuse GL_FRACTIONAL_ODD */
-/* reuse GL_FRACTIONAL_EVEN */
-/* reuse GL_MAX_PATCH_VERTICES */
-/* reuse GL_MAX_TESS_GEN_LEVEL */
-/* reuse GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS */
-/* reuse GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS */
-/* reuse GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_PATCH_COMPONENTS */
-/* reuse GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS */
-/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS */
-/* reuse GL_MAX_TESS_CONTROL_INPUT_COMPONENTS */
-/* reuse GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS */
-/* reuse GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS */
-/* reuse GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER */
-/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER */
-/* reuse GL_TESS_EVALUATION_SHADER */
-/* reuse GL_TESS_CONTROL_SHADER */
-/* Reuse tokens from ARB_texture_buffer_object_rgb32 (none) */
-/* Reuse tokens from ARB_transform_feedback2 */
-/* reuse GL_TRANSFORM_FEEDBACK */
-/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-/* reuse GL_TRANSFORM_FEEDBACK_BINDING */
-/* Reuse tokens from ARB_transform_feedback3 */
-/* reuse GL_MAX_TRANSFORM_FEEDBACK_BUFFERS */
-/* reuse GL_MAX_VERTEX_STREAMS */
-#endif
-
-#ifndef GL_VERSION_4_1
-/* Reuse tokens from ARB_ES2_compatibility */
-/* reuse GL_FIXED */
-/* reuse GL_IMPLEMENTATION_COLOR_READ_TYPE */
-/* reuse GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-/* reuse GL_LOW_FLOAT */
-/* reuse GL_MEDIUM_FLOAT */
-/* reuse GL_HIGH_FLOAT */
-/* reuse GL_LOW_INT */
-/* reuse GL_MEDIUM_INT */
-/* reuse GL_HIGH_INT */
-/* reuse GL_SHADER_COMPILER */
-/* reuse GL_NUM_SHADER_BINARY_FORMATS */
-/* reuse GL_MAX_VERTEX_UNIFORM_VECTORS */
-/* reuse GL_MAX_VARYING_VECTORS */
-/* reuse GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-/* Reuse tokens from ARB_get_program_binary */
-/* reuse GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
-/* reuse GL_PROGRAM_BINARY_LENGTH */
-/* reuse GL_NUM_PROGRAM_BINARY_FORMATS */
-/* reuse GL_PROGRAM_BINARY_FORMATS */
-/* Reuse tokens from ARB_separate_shader_objects */
-/* reuse GL_VERTEX_SHADER_BIT */
-/* reuse GL_FRAGMENT_SHADER_BIT */
-/* reuse GL_GEOMETRY_SHADER_BIT */
-/* reuse GL_TESS_CONTROL_SHADER_BIT */
-/* reuse GL_TESS_EVALUATION_SHADER_BIT */
-/* reuse GL_ALL_SHADER_BITS */
-/* reuse GL_PROGRAM_SEPARABLE */
-/* reuse GL_ACTIVE_PROGRAM */
-/* reuse GL_PROGRAM_PIPELINE_BINDING */
-/* Reuse tokens from ARB_shader_precision (none) */
-/* Reuse tokens from ARB_vertex_attrib_64bit - all are in GL 3.0 and 4.0 already */
-/* Reuse tokens from ARB_viewport_array - some are in GL 1.1 and ARB_provoking_vertex already */
-/* reuse GL_MAX_VIEWPORTS */
-/* reuse GL_VIEWPORT_SUBPIXEL_BITS */
-/* reuse GL_VIEWPORT_BOUNDS_RANGE */
-/* reuse GL_LAYER_PROVOKING_VERTEX */
-/* reuse GL_VIEWPORT_INDEX_PROVOKING_VERTEX */
-/* reuse GL_UNDEFINED_VERTEX */
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_TEXTURE0_ARB                   0x84C0
-#define GL_TEXTURE1_ARB                   0x84C1
-#define GL_TEXTURE2_ARB                   0x84C2
-#define GL_TEXTURE3_ARB                   0x84C3
-#define GL_TEXTURE4_ARB                   0x84C4
-#define GL_TEXTURE5_ARB                   0x84C5
-#define GL_TEXTURE6_ARB                   0x84C6
-#define GL_TEXTURE7_ARB                   0x84C7
-#define GL_TEXTURE8_ARB                   0x84C8
-#define GL_TEXTURE9_ARB                   0x84C9
-#define GL_TEXTURE10_ARB                  0x84CA
-#define GL_TEXTURE11_ARB                  0x84CB
-#define GL_TEXTURE12_ARB                  0x84CC
-#define GL_TEXTURE13_ARB                  0x84CD
-#define GL_TEXTURE14_ARB                  0x84CE
-#define GL_TEXTURE15_ARB                  0x84CF
-#define GL_TEXTURE16_ARB                  0x84D0
-#define GL_TEXTURE17_ARB                  0x84D1
-#define GL_TEXTURE18_ARB                  0x84D2
-#define GL_TEXTURE19_ARB                  0x84D3
-#define GL_TEXTURE20_ARB                  0x84D4
-#define GL_TEXTURE21_ARB                  0x84D5
-#define GL_TEXTURE22_ARB                  0x84D6
-#define GL_TEXTURE23_ARB                  0x84D7
-#define GL_TEXTURE24_ARB                  0x84D8
-#define GL_TEXTURE25_ARB                  0x84D9
-#define GL_TEXTURE26_ARB                  0x84DA
-#define GL_TEXTURE27_ARB                  0x84DB
-#define GL_TEXTURE28_ARB                  0x84DC
-#define GL_TEXTURE29_ARB                  0x84DD
-#define GL_TEXTURE30_ARB                  0x84DE
-#define GL_TEXTURE31_ARB                  0x84DF
-#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_COLOR_SUM_ARB                  0x8458
-#define GL_VERTEX_PROGRAM_ARB             0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
-#define GL_PROGRAM_LENGTH_ARB             0x8627
-#define GL_PROGRAM_STRING_ARB             0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB             0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
-#define GL_PROGRAM_BINDING_ARB            0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
-#define GL_PROGRAM_FORMAT_ARB             0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
-#define GL_MATRIX0_ARB                    0x88C0
-#define GL_MATRIX1_ARB                    0x88C1
-#define GL_MATRIX2_ARB                    0x88C2
-#define GL_MATRIX3_ARB                    0x88C3
-#define GL_MATRIX4_ARB                    0x88C4
-#define GL_MATRIX5_ARB                    0x88C5
-#define GL_MATRIX6_ARB                    0x88C6
-#define GL_MATRIX7_ARB                    0x88C7
-#define GL_MATRIX8_ARB                    0x88C8
-#define GL_MATRIX9_ARB                    0x88C9
-#define GL_MATRIX10_ARB                   0x88CA
-#define GL_MATRIX11_ARB                   0x88CB
-#define GL_MATRIX12_ARB                   0x88CC
-#define GL_MATRIX13_ARB                   0x88CD
-#define GL_MATRIX14_ARB                   0x88CE
-#define GL_MATRIX15_ARB                   0x88CF
-#define GL_MATRIX16_ARB                   0x88D0
-#define GL_MATRIX17_ARB                   0x88D1
-#define GL_MATRIX18_ARB                   0x88D2
-#define GL_MATRIX19_ARB                   0x88D3
-#define GL_MATRIX20_ARB                   0x88D4
-#define GL_MATRIX21_ARB                   0x88D5
-#define GL_MATRIX22_ARB                   0x88D6
-#define GL_MATRIX23_ARB                   0x88D7
-#define GL_MATRIX24_ARB                   0x88D8
-#define GL_MATRIX25_ARB                   0x88D9
-#define GL_MATRIX26_ARB                   0x88DA
-#define GL_MATRIX27_ARB                   0x88DB
-#define GL_MATRIX28_ARB                   0x88DC
-#define GL_MATRIX29_ARB                   0x88DD
-#define GL_MATRIX30_ARB                   0x88DE
-#define GL_MATRIX31_ARB                   0x88DF
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_FRAGMENT_PROGRAM_ARB           0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_QUERY_COUNTER_BITS_ARB         0x8864
-#define GL_CURRENT_QUERY_ARB              0x8865
-#define GL_QUERY_RESULT_ARB               0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
-#define GL_SAMPLES_PASSED_ARB             0x8914
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_PROGRAM_OBJECT_ARB             0x8B40
-#define GL_SHADER_OBJECT_ARB              0x8B48
-#define GL_OBJECT_TYPE_ARB                0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-#define GL_FLOAT_VEC2_ARB                 0x8B50
-#define GL_FLOAT_VEC3_ARB                 0x8B51
-#define GL_FLOAT_VEC4_ARB                 0x8B52
-#define GL_INT_VEC2_ARB                   0x8B53
-#define GL_INT_VEC3_ARB                   0x8B54
-#define GL_INT_VEC4_ARB                   0x8B55
-#define GL_BOOL_ARB                       0x8B56
-#define GL_BOOL_VEC2_ARB                  0x8B57
-#define GL_BOOL_VEC3_ARB                  0x8B58
-#define GL_BOOL_VEC4_ARB                  0x8B59
-#define GL_FLOAT_MAT2_ARB                 0x8B5A
-#define GL_FLOAT_MAT3_ARB                 0x8B5B
-#define GL_FLOAT_MAT4_ARB                 0x8B5C
-#define GL_SAMPLER_1D_ARB                 0x8B5D
-#define GL_SAMPLER_2D_ARB                 0x8B5E
-#define GL_SAMPLER_3D_ARB                 0x8B5F
-#define GL_SAMPLER_CUBE_ARB               0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_POINT_SPRITE_ARB               0x8861
-#define GL_COORD_REPLACE_ARB              0x8862
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
-#define GL_DRAW_BUFFER0_ARB               0x8825
-#define GL_DRAW_BUFFER1_ARB               0x8826
-#define GL_DRAW_BUFFER2_ARB               0x8827
-#define GL_DRAW_BUFFER3_ARB               0x8828
-#define GL_DRAW_BUFFER4_ARB               0x8829
-#define GL_DRAW_BUFFER5_ARB               0x882A
-#define GL_DRAW_BUFFER6_ARB               0x882B
-#define GL_DRAW_BUFFER7_ARB               0x882C
-#define GL_DRAW_BUFFER8_ARB               0x882D
-#define GL_DRAW_BUFFER9_ARB               0x882E
-#define GL_DRAW_BUFFER10_ARB              0x882F
-#define GL_DRAW_BUFFER11_ARB              0x8830
-#define GL_DRAW_BUFFER12_ARB              0x8831
-#define GL_DRAW_BUFFER13_ARB              0x8832
-#define GL_DRAW_BUFFER14_ARB              0x8833
-#define GL_DRAW_BUFFER15_ARB              0x8834
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
-#ifndef GL_ARB_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F             0x8CAC
-#define GL_DEPTH32F_STENCIL8              0x8CAD
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
-#endif
-
-#ifndef GL_ARB_draw_instanced
-#endif
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
-#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
-#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
-#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
-#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
-#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
-#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
-#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
-#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
-#define GL_FRAMEBUFFER_DEFAULT            0x8218
-#define GL_FRAMEBUFFER_UNDEFINED          0x8219
-#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
-#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
-#define GL_DEPTH_STENCIL                  0x84F9
-#define GL_UNSIGNED_INT_24_8              0x84FA
-#define GL_DEPTH24_STENCIL8               0x88F0
-#define GL_TEXTURE_STENCIL_SIZE           0x88F1
-#define GL_TEXTURE_RED_TYPE               0x8C10
-#define GL_TEXTURE_GREEN_TYPE             0x8C11
-#define GL_TEXTURE_BLUE_TYPE              0x8C12
-#define GL_TEXTURE_ALPHA_TYPE             0x8C13
-#define GL_TEXTURE_DEPTH_TYPE             0x8C16
-#define GL_UNSIGNED_NORMALIZED            0x8C17
-#define GL_FRAMEBUFFER_BINDING            0x8CA6
-#define GL_DRAW_FRAMEBUFFER_BINDING       GL_FRAMEBUFFER_BINDING
-#define GL_RENDERBUFFER_BINDING           0x8CA7
-#define GL_READ_FRAMEBUFFER               0x8CA8
-#define GL_DRAW_FRAMEBUFFER               0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
-#define GL_RENDERBUFFER_SAMPLES           0x8CAB
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
-#define GL_COLOR_ATTACHMENT0              0x8CE0
-#define GL_COLOR_ATTACHMENT1              0x8CE1
-#define GL_COLOR_ATTACHMENT2              0x8CE2
-#define GL_COLOR_ATTACHMENT3              0x8CE3
-#define GL_COLOR_ATTACHMENT4              0x8CE4
-#define GL_COLOR_ATTACHMENT5              0x8CE5
-#define GL_COLOR_ATTACHMENT6              0x8CE6
-#define GL_COLOR_ATTACHMENT7              0x8CE7
-#define GL_COLOR_ATTACHMENT8              0x8CE8
-#define GL_COLOR_ATTACHMENT9              0x8CE9
-#define GL_COLOR_ATTACHMENT10             0x8CEA
-#define GL_COLOR_ATTACHMENT11             0x8CEB
-#define GL_COLOR_ATTACHMENT12             0x8CEC
-#define GL_COLOR_ATTACHMENT13             0x8CED
-#define GL_COLOR_ATTACHMENT14             0x8CEE
-#define GL_COLOR_ATTACHMENT15             0x8CEF
-#define GL_DEPTH_ATTACHMENT               0x8D00
-#define GL_STENCIL_ATTACHMENT             0x8D20
-#define GL_FRAMEBUFFER                    0x8D40
-#define GL_RENDERBUFFER                   0x8D41
-#define GL_RENDERBUFFER_WIDTH             0x8D42
-#define GL_RENDERBUFFER_HEIGHT            0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
-#define GL_STENCIL_INDEX1                 0x8D46
-#define GL_STENCIL_INDEX4                 0x8D47
-#define GL_STENCIL_INDEX8                 0x8D48
-#define GL_STENCIL_INDEX16                0x8D49
-#define GL_RENDERBUFFER_RED_SIZE          0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
-#define GL_MAX_SAMPLES                    0x8D57
-#endif
-
-#ifndef GL_ARB_framebuffer_object_DEPRECATED
-#define GL_INDEX                          0x8222
-#define GL_TEXTURE_LUMINANCE_TYPE         0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE         0x8C15
-#endif
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB               0x8DB9
-#endif
-
-#ifndef GL_ARB_geometry_shader4
-#define GL_LINES_ADJACENCY_ARB            0x000A
-#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
-#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
-#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
-#define GL_GEOMETRY_SHADER_ARB            0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
-/* reuse GL_MAX_VARYING_COMPONENTS */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-#endif
-
-#ifndef GL_ARB_half_float_vertex
-#define GL_HALF_FLOAT                     0x140B
-#endif
-
-#ifndef GL_ARB_instanced_arrays
-#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
-#endif
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_MAP_READ_BIT                   0x0001
-#define GL_MAP_WRITE_BIT                  0x0002
-#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
-#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
-#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
-#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
-#endif
-
-#ifndef GL_ARB_texture_buffer_object
-#define GL_TEXTURE_BUFFER_ARB             0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB    0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_ARB     0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_ARB      0x8C2E
-#endif
-
-#ifndef GL_ARB_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1           0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
-#define GL_COMPRESSED_RG_RGTC2            0x8DBD
-#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
-#endif
-
-#ifndef GL_ARB_texture_rg
-#define GL_RG                             0x8227
-#define GL_RG_INTEGER                     0x8228
-#define GL_R8                             0x8229
-#define GL_R16                            0x822A
-#define GL_RG8                            0x822B
-#define GL_RG16                           0x822C
-#define GL_R16F                           0x822D
-#define GL_R32F                           0x822E
-#define GL_RG16F                          0x822F
-#define GL_RG32F                          0x8230
-#define GL_R8I                            0x8231
-#define GL_R8UI                           0x8232
-#define GL_R16I                           0x8233
-#define GL_R16UI                          0x8234
-#define GL_R32I                           0x8235
-#define GL_R32UI                          0x8236
-#define GL_RG8I                           0x8237
-#define GL_RG8UI                          0x8238
-#define GL_RG16I                          0x8239
-#define GL_RG16UI                         0x823A
-#define GL_RG32I                          0x823B
-#define GL_RG32UI                         0x823C
-#endif
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING           0x85B5
-#endif
-
-#ifndef GL_ARB_uniform_buffer_object
-#define GL_UNIFORM_BUFFER                 0x8A11
-#define GL_UNIFORM_BUFFER_BINDING         0x8A28
-#define GL_UNIFORM_BUFFER_START           0x8A29
-#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
-#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
-#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
-#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
-#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
-#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
-#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
-#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
-#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
-#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
-#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
-#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
-#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
-#define GL_UNIFORM_TYPE                   0x8A37
-#define GL_UNIFORM_SIZE                   0x8A38
-#define GL_UNIFORM_NAME_LENGTH            0x8A39
-#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
-#define GL_UNIFORM_OFFSET                 0x8A3B
-#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
-#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
-#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
-#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
-#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
-#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
-#define GL_INVALID_INDEX                  0xFFFFFFFFu
-#endif
-
-#ifndef GL_ARB_compatibility
-/* ARB_compatibility just defines tokens from core 3.0 */
-#endif
-
-#ifndef GL_ARB_copy_buffer
-#define GL_COPY_READ_BUFFER               0x8F36
-#define GL_COPY_WRITE_BUFFER              0x8F37
-#endif
-
-#ifndef GL_ARB_shader_texture_lod
-#endif
-
-#ifndef GL_ARB_depth_clamp
-#define GL_DEPTH_CLAMP                    0x864F
-#endif
-
-#ifndef GL_ARB_draw_elements_base_vertex
-#endif
-
-#ifndef GL_ARB_fragment_coord_conventions
-#endif
-
-#ifndef GL_ARB_provoking_vertex
-#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
-#define GL_FIRST_VERTEX_CONVENTION        0x8E4D
-#define GL_LAST_VERTEX_CONVENTION         0x8E4E
-#define GL_PROVOKING_VERTEX               0x8E4F
-#endif
-
-#ifndef GL_ARB_seamless_cube_map
-#define GL_TEXTURE_CUBE_MAP_SEAMLESS      0x884F
-#endif
-
-#ifndef GL_ARB_sync
-#define GL_MAX_SERVER_WAIT_TIMEOUT        0x9111
-#define GL_OBJECT_TYPE                    0x9112
-#define GL_SYNC_CONDITION                 0x9113
-#define GL_SYNC_STATUS                    0x9114
-#define GL_SYNC_FLAGS                     0x9115
-#define GL_SYNC_FENCE                     0x9116
-#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
-#define GL_UNSIGNALED                     0x9118
-#define GL_SIGNALED                       0x9119
-#define GL_ALREADY_SIGNALED               0x911A
-#define GL_TIMEOUT_EXPIRED                0x911B
-#define GL_CONDITION_SATISFIED            0x911C
-#define GL_WAIT_FAILED                    0x911D
-#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
-#define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
-#endif
-
-#ifndef GL_ARB_texture_multisample
-#define GL_SAMPLE_POSITION                0x8E50
-#define GL_SAMPLE_MASK                    0x8E51
-#define GL_SAMPLE_MASK_VALUE              0x8E52
-#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
-#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
-#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
-#define GL_TEXTURE_SAMPLES                0x9106
-#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
-#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
-#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
-#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
-#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
-#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
-#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
-#define GL_MAX_INTEGER_SAMPLES            0x9110
-#endif
-
-#ifndef GL_ARB_vertex_array_bgra
-/* reuse GL_BGRA */
-#endif
-
-#ifndef GL_ARB_draw_buffers_blend
-#endif
-
-#ifndef GL_ARB_sample_shading
-#define GL_SAMPLE_SHADING_ARB             0x8C36
-#define GL_MIN_SAMPLE_SHADING_VALUE_ARB   0x8C37
-#endif
-
-#ifndef GL_ARB_texture_cube_map_array
-#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB     0x9009
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B
-#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB     0x900C
-#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D
-#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F
-#endif
-
-#ifndef GL_ARB_texture_gather
-#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
-#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
-#endif
-
-#ifndef GL_ARB_texture_query_lod
-#endif
-
-#ifndef GL_ARB_shading_language_include
-#define GL_SHADER_INCLUDE_ARB             0x8DAE
-#define GL_NAMED_STRING_LENGTH_ARB        0x8DE9
-#define GL_NAMED_STRING_TYPE_ARB          0x8DEA
-#endif
-
-#ifndef GL_ARB_texture_compression_bptc
-#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C
-#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
-#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
-#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
-#endif
-
-#ifndef GL_ARB_blend_func_extended
-#define GL_SRC1_COLOR                     0x88F9
-/* reuse GL_SRC1_ALPHA */
-#define GL_ONE_MINUS_SRC1_COLOR           0x88FA
-#define GL_ONE_MINUS_SRC1_ALPHA           0x88FB
-#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS   0x88FC
-#endif
-
-#ifndef GL_ARB_explicit_attrib_location
-#endif
-
-#ifndef GL_ARB_occlusion_query2
-#define GL_ANY_SAMPLES_PASSED             0x8C2F
-#endif
-
-#ifndef GL_ARB_sampler_objects
-#define GL_SAMPLER_BINDING                0x8919
-#endif
-
-#ifndef GL_ARB_shader_bit_encoding
-#endif
-
-#ifndef GL_ARB_texture_rgb10_a2ui
-#define GL_RGB10_A2UI                     0x906F
-#endif
-
-#ifndef GL_ARB_texture_swizzle
-#define GL_TEXTURE_SWIZZLE_R              0x8E42
-#define GL_TEXTURE_SWIZZLE_G              0x8E43
-#define GL_TEXTURE_SWIZZLE_B              0x8E44
-#define GL_TEXTURE_SWIZZLE_A              0x8E45
-#define GL_TEXTURE_SWIZZLE_RGBA           0x8E46
-#endif
-
-#ifndef GL_ARB_timer_query
-#define GL_TIME_ELAPSED                   0x88BF
-#define GL_TIMESTAMP                      0x8E28
-#endif
-
-#ifndef GL_ARB_vertex_type_2_10_10_10_rev
-/* reuse GL_UNSIGNED_INT_2_10_10_10_REV */
-#define GL_INT_2_10_10_10_REV             0x8D9F
-#endif
-
-#ifndef GL_ARB_draw_indirect
-#define GL_DRAW_INDIRECT_BUFFER           0x8F3F
-#define GL_DRAW_INDIRECT_BUFFER_BINDING   0x8F43
-#endif
-
-#ifndef GL_ARB_gpu_shader5
-#define GL_GEOMETRY_SHADER_INVOCATIONS    0x887F
-#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
-#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
-#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
-#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
-/* reuse GL_MAX_VERTEX_STREAMS */
-#endif
-
-#ifndef GL_ARB_gpu_shader_fp64
-/* reuse GL_DOUBLE */
-#define GL_DOUBLE_VEC2                    0x8FFC
-#define GL_DOUBLE_VEC3                    0x8FFD
-#define GL_DOUBLE_VEC4                    0x8FFE
-#define GL_DOUBLE_MAT2                    0x8F46
-#define GL_DOUBLE_MAT3                    0x8F47
-#define GL_DOUBLE_MAT4                    0x8F48
-#define GL_DOUBLE_MAT2x3                  0x8F49
-#define GL_DOUBLE_MAT2x4                  0x8F4A
-#define GL_DOUBLE_MAT3x2                  0x8F4B
-#define GL_DOUBLE_MAT3x4                  0x8F4C
-#define GL_DOUBLE_MAT4x2                  0x8F4D
-#define GL_DOUBLE_MAT4x3                  0x8F4E
-#endif
-
-#ifndef GL_ARB_shader_subroutine
-#define GL_ACTIVE_SUBROUTINES             0x8DE5
-#define GL_ACTIVE_SUBROUTINE_UNIFORMS     0x8DE6
-#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
-#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH   0x8E48
-#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
-#define GL_MAX_SUBROUTINES                0x8DE7
-#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
-#define GL_NUM_COMPATIBLE_SUBROUTINES     0x8E4A
-#define GL_COMPATIBLE_SUBROUTINES         0x8E4B
-/* reuse GL_UNIFORM_SIZE */
-/* reuse GL_UNIFORM_NAME_LENGTH */
-#endif
-
-#ifndef GL_ARB_tessellation_shader
-#define GL_PATCHES                        0x000E
-#define GL_PATCH_VERTICES                 0x8E72
-#define GL_PATCH_DEFAULT_INNER_LEVEL      0x8E73
-#define GL_PATCH_DEFAULT_OUTER_LEVEL      0x8E74
-#define GL_TESS_CONTROL_OUTPUT_VERTICES   0x8E75
-#define GL_TESS_GEN_MODE                  0x8E76
-#define GL_TESS_GEN_SPACING               0x8E77
-#define GL_TESS_GEN_VERTEX_ORDER          0x8E78
-#define GL_TESS_GEN_POINT_MODE            0x8E79
-/* reuse GL_TRIANGLES */
-/* reuse GL_QUADS */
-#define GL_ISOLINES                       0x8E7A
-/* reuse GL_EQUAL */
-#define GL_FRACTIONAL_ODD                 0x8E7B
-#define GL_FRACTIONAL_EVEN                0x8E7C
-/* reuse GL_CCW */
-/* reuse GL_CW */
-#define GL_MAX_PATCH_VERTICES             0x8E7D
-#define GL_MAX_TESS_GEN_LEVEL             0x8E7E
-#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
-#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
-#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
-#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
-#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
-#define GL_MAX_TESS_PATCH_COMPONENTS      0x8E84
-#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
-#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
-#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
-#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
-#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
-#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
-#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
-#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
-#define GL_TESS_EVALUATION_SHADER         0x8E87
-#define GL_TESS_CONTROL_SHADER            0x8E88
-#endif
-
-#ifndef GL_ARB_texture_buffer_object_rgb32
-/* reuse GL_RGB32F */
-/* reuse GL_RGB32UI */
-/* reuse GL_RGB32I */
-#endif
-
-#ifndef GL_ARB_transform_feedback2
-#define GL_TRANSFORM_FEEDBACK             0x8E22
-#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
-#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
-#define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
-#endif
-
-#ifndef GL_ARB_transform_feedback3
-#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
-#define GL_MAX_VERTEX_STREAMS             0x8E71
-#endif
-
-#ifndef GL_ARB_ES2_compatibility
-#define GL_FIXED                          0x140C
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
-#define GL_LOW_FLOAT                      0x8DF0
-#define GL_MEDIUM_FLOAT                   0x8DF1
-#define GL_HIGH_FLOAT                     0x8DF2
-#define GL_LOW_INT                        0x8DF3
-#define GL_MEDIUM_INT                     0x8DF4
-#define GL_HIGH_INT                       0x8DF5
-#define GL_SHADER_COMPILER                0x8DFA
-#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
-#define GL_MAX_VERTEX_UNIFORM_VECTORS     0x8DFB
-#define GL_MAX_VARYING_VECTORS            0x8DFC
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS   0x8DFD
-#endif
-
-#ifndef GL_ARB_get_program_binary
-#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257
-#define GL_PROGRAM_BINARY_LENGTH          0x8741
-#define GL_NUM_PROGRAM_BINARY_FORMATS     0x87FE
-#define GL_PROGRAM_BINARY_FORMATS         0x87FF
-#endif
-
-#ifndef GL_ARB_separate_shader_objects
-#define GL_VERTEX_SHADER_BIT              0x00000001
-#define GL_FRAGMENT_SHADER_BIT            0x00000002
-#define GL_GEOMETRY_SHADER_BIT            0x00000004
-#define GL_TESS_CONTROL_SHADER_BIT        0x00000008
-#define GL_TESS_EVALUATION_SHADER_BIT     0x00000010
-#define GL_ALL_SHADER_BITS                0xFFFFFFFF
-#define GL_PROGRAM_SEPARABLE              0x8258
-#define GL_ACTIVE_PROGRAM                 0x8259
-#define GL_PROGRAM_PIPELINE_BINDING       0x825A
-#endif
-
-#ifndef GL_ARB_shader_precision
-#endif
-
-#ifndef GL_ARB_vertex_attrib_64bit
-/* reuse GL_RGB32I */
-/* reuse GL_DOUBLE_VEC2 */
-/* reuse GL_DOUBLE_VEC3 */
-/* reuse GL_DOUBLE_VEC4 */
-/* reuse GL_DOUBLE_MAT2 */
-/* reuse GL_DOUBLE_MAT3 */
-/* reuse GL_DOUBLE_MAT4 */
-/* reuse GL_DOUBLE_MAT2x3 */
-/* reuse GL_DOUBLE_MAT2x4 */
-/* reuse GL_DOUBLE_MAT3x2 */
-/* reuse GL_DOUBLE_MAT3x4 */
-/* reuse GL_DOUBLE_MAT4x2 */
-/* reuse GL_DOUBLE_MAT4x3 */
-#endif
-
-#ifndef GL_ARB_viewport_array
-/* reuse GL_SCISSOR_BOX */
-/* reuse GL_VIEWPORT */
-/* reuse GL_DEPTH_RANGE */
-/* reuse GL_SCISSOR_TEST */
-#define GL_MAX_VIEWPORTS                  0x825B
-#define GL_VIEWPORT_SUBPIXEL_BITS         0x825C
-#define GL_VIEWPORT_BOUNDS_RANGE          0x825D
-#define GL_LAYER_PROVOKING_VERTEX         0x825E
-#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
-#define GL_UNDEFINED_VERTEX               0x8260
-/* reuse GL_FIRST_VERTEX_CONVENTION */
-/* reuse GL_LAST_VERTEX_CONVENTION */
-/* reuse GL_PROVOKING_VERTEX */
-#endif
-
-#ifndef GL_ARB_cl_event
-#define GL_SYNC_CL_EVENT_ARB              0x8240
-#define GL_SYNC_CL_EVENT_COMPLETE_ARB     0x8241
-#endif
-
-#ifndef GL_ARB_debug_output
-#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB   0x8242
-#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243
-#define GL_DEBUG_CALLBACK_FUNCTION_ARB    0x8244
-#define GL_DEBUG_CALLBACK_USER_PARAM_ARB  0x8245
-#define GL_DEBUG_SOURCE_API_ARB           0x8246
-#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247
-#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248
-#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB   0x8249
-#define GL_DEBUG_SOURCE_APPLICATION_ARB   0x824A
-#define GL_DEBUG_SOURCE_OTHER_ARB         0x824B
-#define GL_DEBUG_TYPE_ERROR_ARB           0x824C
-#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D
-#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E
-#define GL_DEBUG_TYPE_PORTABILITY_ARB     0x824F
-#define GL_DEBUG_TYPE_PERFORMANCE_ARB     0x8250
-#define GL_DEBUG_TYPE_OTHER_ARB           0x8251
-#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB   0x9143
-#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB  0x9144
-#define GL_DEBUG_LOGGED_MESSAGES_ARB      0x9145
-#define GL_DEBUG_SEVERITY_HIGH_ARB        0x9146
-#define GL_DEBUG_SEVERITY_MEDIUM_ARB      0x9147
-#define GL_DEBUG_SEVERITY_LOW_ARB         0x9148
-#endif
-
-#ifndef GL_ARB_robustness
-/* reuse GL_NO_ERROR */
-#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004
-#define GL_LOSE_CONTEXT_ON_RESET_ARB      0x8252
-#define GL_GUILTY_CONTEXT_RESET_ARB       0x8253
-#define GL_INNOCENT_CONTEXT_RESET_ARB     0x8254
-#define GL_UNKNOWN_CONTEXT_RESET_ARB      0x8255
-#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
-#define GL_NO_RESET_NOTIFICATION_ARB      0x8261
-#endif
-
-#ifndef GL_ARB_shader_stencil_export
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_DOT3_RGB_EXT                   0x8740
-#define GL_DOT3_RGBA_EXT                  0x8741
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_MIRROR_CLAMP_ATI               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_ELEMENT_ARRAY_APPLE            0x8A0C
-#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8A0D
-#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x8A0E
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_DRAW_PIXELS_APPLE              0x8A0A
-#define GL_FENCE_APPLE                    0x8A0B
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CLIENT_APPLE           0x85B4
-#define GL_STORAGE_CACHED_APPLE           0x85BE
-#define GL_STORAGE_SHARED_APPLE           0x85BF
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_YCBCR_422_APPLE                0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_RGB_S3TC                       0x83A0
-#define GL_RGB4_S3TC                      0x83A1
-#define GL_RGBA_S3TC                      0x83A2
-#define GL_RGBA4_S3TC                     0x83A3
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
-#define GL_DRAW_BUFFER0_ATI               0x8825
-#define GL_DRAW_BUFFER1_ATI               0x8826
-#define GL_DRAW_BUFFER2_ATI               0x8827
-#define GL_DRAW_BUFFER3_ATI               0x8828
-#define GL_DRAW_BUFFER4_ATI               0x8829
-#define GL_DRAW_BUFFER5_ATI               0x882A
-#define GL_DRAW_BUFFER6_ATI               0x882B
-#define GL_DRAW_BUFFER7_ATI               0x882C
-#define GL_DRAW_BUFFER8_ATI               0x882D
-#define GL_DRAW_BUFFER9_ATI               0x882E
-#define GL_DRAW_BUFFER10_ATI              0x882F
-#define GL_DRAW_BUFFER11_ATI              0x8830
-#define GL_DRAW_BUFFER12_ATI              0x8831
-#define GL_DRAW_BUFFER13_ATI              0x8832
-#define GL_DRAW_BUFFER14_ATI              0x8833
-#define GL_DRAW_BUFFER15_ATI              0x8834
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_MODULATE_ADD_ATI               0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
-#define GL_MODULATE_SUBTRACT_ATI          0x8746
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV            0x8870
-#define GL_MAX_TEXTURE_COORDS_NV          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
-#define GL_PROGRAM_ERROR_STRING_NV        0x8874
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_HALF_FLOAT_NV                  0x140B
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_PRIMITIVE_RESTART_NV           0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-#endif
-
-#ifndef GL_NV_vertex_program2
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_STENCIL_BACK_FUNC_ATI          0x8800
-#define GL_STENCIL_BACK_FAIL_ATI          0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
-#define GL_DEPTH_BOUNDS_EXT               0x8891
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_MIRROR_CLAMP_EXT               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_BLEND_EQUATION_RGB_EXT         0x8009
-#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_PACK_INVERT_MESA               0x8758
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
-#define GL_YCBCR_MESA                     0x8757
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
-#endif
-
-#ifndef GL_NV_vertex_program3
-/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#define GL_RENDERBUFFER_EXT               0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT             0x8D46
-#define GL_STENCIL_INDEX4_EXT             0x8D47
-#define GL_STENCIL_INDEX8_EXT             0x8D48
-#define GL_STENCIL_INDEX16_EXT            0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_DEPTH_STENCIL_EXT              0x84F9
-#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
-#define GL_DEPTH24_STENCIL8_EXT           0x88F0
-#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_STENCIL_TAG_BITS_EXT           0x88F2
-#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_SRGB_EXT                       0x8C40
-#define GL_SRGB8_EXT                      0x8C41
-#define GL_SRGB_ALPHA_EXT                 0x8C42
-#define GL_SRGB8_ALPHA8_EXT               0x8C43
-#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
-#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
-#define GL_SLUMINANCE_EXT                 0x8C46
-#define GL_SLUMINANCE8_EXT                0x8C47
-#define GL_COMPRESSED_SRGB_EXT            0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
-#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
-#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
-#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
-#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
-#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
-#define GL_MAX_SAMPLES_EXT                0x8D57
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_TEXTURE_1D_STACK_MESAX         0x8759
-#define GL_TEXTURE_2D_STACK_MESAX         0x875A
-#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
-#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
-#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
-#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_TIME_ELAPSED_EXT               0x88BF
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
-#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
-#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
-#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
-#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
-#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
-#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
-#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_LINES_ADJACENCY_EXT            0x000A
-#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
-#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
-#define GL_GEOMETRY_PROGRAM_NV            0x8C26
-#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
-#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
-#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
-#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_GEOMETRY_SHADER_EXT            0x8DD9
-/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
-/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
-/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
-/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
-#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
-/* reuse GL_LINES_ADJACENCY_EXT */
-/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
-/* reuse GL_TRIANGLES_ADJACENCY_EXT */
-/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-/* reuse GL_PROGRAM_POINT_SIZE_EXT */
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
-#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
-#define GL_SAMPLER_BUFFER_EXT             0x8DC2
-#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
-#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
-#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
-#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
-#define GL_INT_SAMPLER_1D_EXT             0x8DC9
-#define GL_INT_SAMPLER_2D_EXT             0x8DCA
-#define GL_INT_SAMPLER_3D_EXT             0x8DCB
-#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
-#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
-#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
-#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_R11F_G11F_B10F_EXT             0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
-#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
-#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
-#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
-#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_TEXTURE_BUFFER_EXT             0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
-#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
-#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
-#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
-#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
-#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_RGB9_E5_EXT                    0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
-#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
-#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
-#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
-#endif
-
-#ifndef GL_NV_fragment_program4
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
-#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
-#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
-#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
-#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
-#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
-#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
-#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
-#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
-#define GL_TEXTURE_COORD_NV               0x8C79
-#define GL_CLIP_DISTANCE_NV               0x8C7A
-#define GL_VERTEX_ID_NV                   0x8C7B
-#define GL_PRIMITIVE_ID_NV                0x8C7C
-#define GL_GENERIC_ATTRIB_NV              0x8C7D
-#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
-#define GL_ACTIVE_VARYINGS_NV             0x8C81
-#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
-#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
-#define GL_PRIMITIVES_GENERATED_NV        0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
-#define GL_RASTERIZER_DISCARD_NV          0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
-#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
-#define GL_LAYER_NV                       0x8DAA
-#define GL_NEXT_BUFFER_NV                 -2
-#define GL_SKIP_COMPONENTS4_NV            -3
-#define GL_SKIP_COMPONENTS3_NV            -4
-#define GL_SKIP_COMPONENTS2_NV            -5
-#define GL_SKIP_COMPONENTS1_NV            -6
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
-#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
-#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
-#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
-#define GL_UNIFORM_BUFFER_EXT             0x8DEE
-#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_RGBA32UI_EXT                   0x8D70
-#define GL_RGB32UI_EXT                    0x8D71
-#define GL_ALPHA32UI_EXT                  0x8D72
-#define GL_INTENSITY32UI_EXT              0x8D73
-#define GL_LUMINANCE32UI_EXT              0x8D74
-#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
-#define GL_RGBA16UI_EXT                   0x8D76
-#define GL_RGB16UI_EXT                    0x8D77
-#define GL_ALPHA16UI_EXT                  0x8D78
-#define GL_INTENSITY16UI_EXT              0x8D79
-#define GL_LUMINANCE16UI_EXT              0x8D7A
-#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
-#define GL_RGBA8UI_EXT                    0x8D7C
-#define GL_RGB8UI_EXT                     0x8D7D
-#define GL_ALPHA8UI_EXT                   0x8D7E
-#define GL_INTENSITY8UI_EXT               0x8D7F
-#define GL_LUMINANCE8UI_EXT               0x8D80
-#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
-#define GL_RGBA32I_EXT                    0x8D82
-#define GL_RGB32I_EXT                     0x8D83
-#define GL_ALPHA32I_EXT                   0x8D84
-#define GL_INTENSITY32I_EXT               0x8D85
-#define GL_LUMINANCE32I_EXT               0x8D86
-#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
-#define GL_RGBA16I_EXT                    0x8D88
-#define GL_RGB16I_EXT                     0x8D89
-#define GL_ALPHA16I_EXT                   0x8D8A
-#define GL_INTENSITY16I_EXT               0x8D8B
-#define GL_LUMINANCE16I_EXT               0x8D8C
-#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
-#define GL_RGBA8I_EXT                     0x8D8E
-#define GL_RGB8I_EXT                      0x8D8F
-#define GL_ALPHA8I_EXT                    0x8D90
-#define GL_INTENSITY8I_EXT                0x8D91
-#define GL_LUMINANCE8I_EXT                0x8D92
-#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
-#define GL_RED_INTEGER_EXT                0x8D94
-#define GL_GREEN_INTEGER_EXT              0x8D95
-#define GL_BLUE_INTEGER_EXT               0x8D96
-#define GL_ALPHA_INTEGER_EXT              0x8D97
-#define GL_RGB_INTEGER_EXT                0x8D98
-#define GL_RGBA_INTEGER_EXT               0x8D99
-#define GL_BGR_INTEGER_EXT                0x8D9A
-#define GL_BGRA_INTEGER_EXT               0x8D9B
-#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
-#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
-#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
-#endif
-
-#ifndef GL_GREMEDY_frame_terminator
-#endif
-
-#ifndef GL_NV_conditional_render
-#define GL_QUERY_WAIT_NV                  0x8E13
-#define GL_QUERY_NO_WAIT_NV               0x8E14
-#define GL_QUERY_BY_REGION_WAIT_NV        0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT_NV     0x8E16
-#endif
-
-#ifndef GL_NV_present_video
-#define GL_FRAME_NV                       0x8E26
-#define GL_FIELDS_NV                      0x8E27
-#define GL_CURRENT_TIME_NV                0x8E28
-#define GL_NUM_FILL_STREAMS_NV            0x8E29
-#define GL_PRESENT_TIME_NV                0x8E2A
-#define GL_PRESENT_DURATION_NV            0x8E2B
-#endif
-
-#ifndef GL_EXT_transform_feedback
-#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT  0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
-#define GL_INTERLEAVED_ATTRIBS_EXT        0x8C8C
-#define GL_SEPARATE_ATTRIBS_EXT           0x8C8D
-#define GL_PRIMITIVES_GENERATED_EXT       0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
-#define GL_RASTERIZER_DISCARD_EXT         0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
-#endif
-
-#ifndef GL_EXT_direct_state_access
-#define GL_PROGRAM_MATRIX_EXT             0x8E2D
-#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
-#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
-#endif
-
-#ifndef GL_EXT_vertex_array_bgra
-/* reuse GL_BGRA */
-#endif
-
-#ifndef GL_EXT_texture_swizzle
-#define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
-#define GL_TEXTURE_SWIZZLE_G_EXT          0x8E43
-#define GL_TEXTURE_SWIZZLE_B_EXT          0x8E44
-#define GL_TEXTURE_SWIZZLE_A_EXT          0x8E45
-#define GL_TEXTURE_SWIZZLE_RGBA_EXT       0x8E46
-#endif
-
-#ifndef GL_NV_explicit_multisample
-#define GL_SAMPLE_POSITION_NV             0x8E50
-#define GL_SAMPLE_MASK_NV                 0x8E51
-#define GL_SAMPLE_MASK_VALUE_NV           0x8E52
-#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
-#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
-#define GL_TEXTURE_RENDERBUFFER_NV        0x8E55
-#define GL_SAMPLER_RENDERBUFFER_NV        0x8E56
-#define GL_INT_SAMPLER_RENDERBUFFER_NV    0x8E57
-#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
-#define GL_MAX_SAMPLE_MASK_WORDS_NV       0x8E59
-#endif
-
-#ifndef GL_NV_transform_feedback2
-#define GL_TRANSFORM_FEEDBACK_NV          0x8E22
-#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
-#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
-#define GL_TRANSFORM_FEEDBACK_BINDING_NV  0x8E25
-#endif
-
-#ifndef GL_ATI_meminfo
-#define GL_VBO_FREE_MEMORY_ATI            0x87FB
-#define GL_TEXTURE_FREE_MEMORY_ATI        0x87FC
-#define GL_RENDERBUFFER_FREE_MEMORY_ATI   0x87FD
-#endif
-
-#ifndef GL_AMD_performance_monitor
-#define GL_COUNTER_TYPE_AMD               0x8BC0
-#define GL_COUNTER_RANGE_AMD              0x8BC1
-#define GL_UNSIGNED_INT64_AMD             0x8BC2
-#define GL_PERCENTAGE_AMD                 0x8BC3
-#define GL_PERFMON_RESULT_AVAILABLE_AMD   0x8BC4
-#define GL_PERFMON_RESULT_SIZE_AMD        0x8BC5
-#define GL_PERFMON_RESULT_AMD             0x8BC6
-#endif
-
-#ifndef GL_AMD_texture_texture4
-#endif
-
-#ifndef GL_AMD_vertex_shader_tesselator
-#define GL_SAMPLER_BUFFER_AMD             0x9001
-#define GL_INT_SAMPLER_BUFFER_AMD         0x9002
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
-#define GL_TESSELLATION_MODE_AMD          0x9004
-#define GL_TESSELLATION_FACTOR_AMD        0x9005
-#define GL_DISCRETE_AMD                   0x9006
-#define GL_CONTINUOUS_AMD                 0x9007
-#endif
-
-#ifndef GL_EXT_provoking_vertex
-#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
-#define GL_FIRST_VERTEX_CONVENTION_EXT    0x8E4D
-#define GL_LAST_VERTEX_CONVENTION_EXT     0x8E4E
-#define GL_PROVOKING_VERTEX_EXT           0x8E4F
-#endif
-
-#ifndef GL_EXT_texture_snorm
-#define GL_ALPHA_SNORM                    0x9010
-#define GL_LUMINANCE_SNORM                0x9011
-#define GL_LUMINANCE_ALPHA_SNORM          0x9012
-#define GL_INTENSITY_SNORM                0x9013
-#define GL_ALPHA8_SNORM                   0x9014
-#define GL_LUMINANCE8_SNORM               0x9015
-#define GL_LUMINANCE8_ALPHA8_SNORM        0x9016
-#define GL_INTENSITY8_SNORM               0x9017
-#define GL_ALPHA16_SNORM                  0x9018
-#define GL_LUMINANCE16_SNORM              0x9019
-#define GL_LUMINANCE16_ALPHA16_SNORM      0x901A
-#define GL_INTENSITY16_SNORM              0x901B
-/* reuse GL_RED_SNORM */
-/* reuse GL_RG_SNORM */
-/* reuse GL_RGB_SNORM */
-/* reuse GL_RGBA_SNORM */
-/* reuse GL_R8_SNORM */
-/* reuse GL_RG8_SNORM */
-/* reuse GL_RGB8_SNORM */
-/* reuse GL_RGBA8_SNORM */
-/* reuse GL_R16_SNORM */
-/* reuse GL_RG16_SNORM */
-/* reuse GL_RGB16_SNORM */
-/* reuse GL_RGBA16_SNORM */
-/* reuse GL_SIGNED_NORMALIZED */
-#endif
-
-#ifndef GL_AMD_draw_buffers_blend
-#endif
-
-#ifndef GL_APPLE_texture_range
-#define GL_TEXTURE_RANGE_LENGTH_APPLE     0x85B7
-#define GL_TEXTURE_RANGE_POINTER_APPLE    0x85B8
-#define GL_TEXTURE_STORAGE_HINT_APPLE     0x85BC
-#define GL_STORAGE_PRIVATE_APPLE          0x85BD
-/* reuse GL_STORAGE_CACHED_APPLE */
-/* reuse GL_STORAGE_SHARED_APPLE */
-#endif
-
-#ifndef GL_APPLE_float_pixels
-#define GL_HALF_APPLE                     0x140B
-#define GL_RGBA_FLOAT32_APPLE             0x8814
-#define GL_RGB_FLOAT32_APPLE              0x8815
-#define GL_ALPHA_FLOAT32_APPLE            0x8816
-#define GL_INTENSITY_FLOAT32_APPLE        0x8817
-#define GL_LUMINANCE_FLOAT32_APPLE        0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE  0x8819
-#define GL_RGBA_FLOAT16_APPLE             0x881A
-#define GL_RGB_FLOAT16_APPLE              0x881B
-#define GL_ALPHA_FLOAT16_APPLE            0x881C
-#define GL_INTENSITY_FLOAT16_APPLE        0x881D
-#define GL_LUMINANCE_FLOAT16_APPLE        0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE  0x881F
-#define GL_COLOR_FLOAT_APPLE              0x8A0F
-#endif
-
-#ifndef GL_APPLE_vertex_program_evaluators
-#define GL_VERTEX_ATTRIB_MAP1_APPLE       0x8A00
-#define GL_VERTEX_ATTRIB_MAP2_APPLE       0x8A01
-#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE  0x8A02
-#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03
-#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04
-#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05
-#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE  0x8A06
-#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07
-#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08
-#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09
-#endif
-
-#ifndef GL_APPLE_aux_depth_stencil
-#define GL_AUX_DEPTH_STENCIL_APPLE        0x8A14
-#endif
-
-#ifndef GL_APPLE_object_purgeable
-#define GL_BUFFER_OBJECT_APPLE            0x85B3
-#define GL_RELEASED_APPLE                 0x8A19
-#define GL_VOLATILE_APPLE                 0x8A1A
-#define GL_RETAINED_APPLE                 0x8A1B
-#define GL_UNDEFINED_APPLE                0x8A1C
-#define GL_PURGEABLE_APPLE                0x8A1D
-#endif
-
-#ifndef GL_APPLE_row_bytes
-#define GL_PACK_ROW_BYTES_APPLE           0x8A15
-#define GL_UNPACK_ROW_BYTES_APPLE         0x8A16
-#endif
-
-#ifndef GL_APPLE_rgb_422
-#define GL_RGB_422_APPLE                  0x8A1F
-/* reuse GL_UNSIGNED_SHORT_8_8_APPLE */
-/* reuse GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-#endif
-
-#ifndef GL_NV_video_capture
-#define GL_VIDEO_BUFFER_NV                0x9020
-#define GL_VIDEO_BUFFER_BINDING_NV        0x9021
-#define GL_FIELD_UPPER_NV                 0x9022
-#define GL_FIELD_LOWER_NV                 0x9023
-#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV   0x9024
-#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
-#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
-#define GL_LAST_VIDEO_CAPTURE_STATUS_NV   0x9027
-#define GL_VIDEO_BUFFER_PITCH_NV          0x9028
-#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
-#define GL_VIDEO_COLOR_CONVERSION_MAX_NV  0x902A
-#define GL_VIDEO_COLOR_CONVERSION_MIN_NV  0x902B
-#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
-#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
-#define GL_PARTIAL_SUCCESS_NV             0x902E
-#define GL_SUCCESS_NV                     0x902F
-#define GL_FAILURE_NV                     0x9030
-#define GL_YCBYCR8_422_NV                 0x9031
-#define GL_YCBAYCR8A_4224_NV              0x9032
-#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV  0x9033
-#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
-#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV  0x9035
-#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
-#define GL_Z4Y12Z4CB12Z4CR12_444_NV       0x9037
-#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV   0x9038
-#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV  0x9039
-#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
-#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
-#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
-#endif
-
-#ifndef GL_NV_copy_image
-#endif
-
-#ifndef GL_EXT_separate_shader_objects
-#define GL_ACTIVE_PROGRAM_EXT             0x8B8D
-#endif
-
-#ifndef GL_NV_parameter_buffer_object2
-#endif
-
-#ifndef GL_NV_shader_buffer_load
-#define GL_BUFFER_GPU_ADDRESS_NV          0x8F1D
-#define GL_GPU_ADDRESS_NV                 0x8F34
-#define GL_MAX_SHADER_BUFFER_ADDRESS_NV   0x8F35
-#endif
-
-#ifndef GL_NV_vertex_buffer_unified_memory
-#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
-#define GL_ELEMENT_ARRAY_UNIFIED_NV       0x8F1F
-#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
-#define GL_VERTEX_ARRAY_ADDRESS_NV        0x8F21
-#define GL_NORMAL_ARRAY_ADDRESS_NV        0x8F22
-#define GL_COLOR_ARRAY_ADDRESS_NV         0x8F23
-#define GL_INDEX_ARRAY_ADDRESS_NV         0x8F24
-#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
-#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV     0x8F26
-#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
-#define GL_FOG_COORD_ARRAY_ADDRESS_NV     0x8F28
-#define GL_ELEMENT_ARRAY_ADDRESS_NV       0x8F29
-#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV  0x8F2A
-#define GL_VERTEX_ARRAY_LENGTH_NV         0x8F2B
-#define GL_NORMAL_ARRAY_LENGTH_NV         0x8F2C
-#define GL_COLOR_ARRAY_LENGTH_NV          0x8F2D
-#define GL_INDEX_ARRAY_LENGTH_NV          0x8F2E
-#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV  0x8F2F
-#define GL_EDGE_FLAG_ARRAY_LENGTH_NV      0x8F30
-#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
-#define GL_FOG_COORD_ARRAY_LENGTH_NV      0x8F32
-#define GL_ELEMENT_ARRAY_LENGTH_NV        0x8F33
-#define GL_DRAW_INDIRECT_UNIFIED_NV       0x8F40
-#define GL_DRAW_INDIRECT_ADDRESS_NV       0x8F41
-#define GL_DRAW_INDIRECT_LENGTH_NV        0x8F42
-#endif
-
-#ifndef GL_NV_texture_barrier
-#endif
-
-#ifndef GL_AMD_shader_stencil_export
-#endif
-
-#ifndef GL_AMD_seamless_cubemap_per_texture
-/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS_ARB */
-#endif
-
-#ifndef GL_AMD_conservative_depth
-#endif
-
-#ifndef GL_EXT_shader_image_load_store
-#define GL_MAX_IMAGE_UNITS_EXT            0x8F38
-#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39
-#define GL_IMAGE_BINDING_NAME_EXT         0x8F3A
-#define GL_IMAGE_BINDING_LEVEL_EXT        0x8F3B
-#define GL_IMAGE_BINDING_LAYERED_EXT      0x8F3C
-#define GL_IMAGE_BINDING_LAYER_EXT        0x8F3D
-#define GL_IMAGE_BINDING_ACCESS_EXT       0x8F3E
-#define GL_IMAGE_1D_EXT                   0x904C
-#define GL_IMAGE_2D_EXT                   0x904D
-#define GL_IMAGE_3D_EXT                   0x904E
-#define GL_IMAGE_2D_RECT_EXT              0x904F
-#define GL_IMAGE_CUBE_EXT                 0x9050
-#define GL_IMAGE_BUFFER_EXT               0x9051
-#define GL_IMAGE_1D_ARRAY_EXT             0x9052
-#define GL_IMAGE_2D_ARRAY_EXT             0x9053
-#define GL_IMAGE_CUBE_MAP_ARRAY_EXT       0x9054
-#define GL_IMAGE_2D_MULTISAMPLE_EXT       0x9055
-#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056
-#define GL_INT_IMAGE_1D_EXT               0x9057
-#define GL_INT_IMAGE_2D_EXT               0x9058
-#define GL_INT_IMAGE_3D_EXT               0x9059
-#define GL_INT_IMAGE_2D_RECT_EXT          0x905A
-#define GL_INT_IMAGE_CUBE_EXT             0x905B
-#define GL_INT_IMAGE_BUFFER_EXT           0x905C
-#define GL_INT_IMAGE_1D_ARRAY_EXT         0x905D
-#define GL_INT_IMAGE_2D_ARRAY_EXT         0x905E
-#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT   0x905F
-#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT   0x9060
-#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061
-#define GL_UNSIGNED_INT_IMAGE_1D_EXT      0x9062
-#define GL_UNSIGNED_INT_IMAGE_2D_EXT      0x9063
-#define GL_UNSIGNED_INT_IMAGE_3D_EXT      0x9064
-#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065
-#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT    0x9066
-#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT  0x9067
-#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068
-#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069
-#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A
-#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B
-#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C
-#define GL_MAX_IMAGE_SAMPLES_EXT          0x906D
-#define GL_IMAGE_BINDING_FORMAT_EXT       0x906E
-#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001
-#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT  0x00000002
-#define GL_UNIFORM_BARRIER_BIT_EXT        0x00000004
-#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT  0x00000008
-#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020
-#define GL_COMMAND_BARRIER_BIT_EXT        0x00000040
-#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT   0x00000080
-#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100
-#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT  0x00000200
-#define GL_FRAMEBUFFER_BARRIER_BIT_EXT    0x00000400
-#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800
-#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000
-#define GL_ALL_BARRIER_BITS_EXT           0xFFFFFFFF
-#endif
-
-#ifndef GL_EXT_vertex_attrib_64bit
-/* reuse GL_DOUBLE */
-#define GL_DOUBLE_VEC2_EXT                0x8FFC
-#define GL_DOUBLE_VEC3_EXT                0x8FFD
-#define GL_DOUBLE_VEC4_EXT                0x8FFE
-#define GL_DOUBLE_MAT2_EXT                0x8F46
-#define GL_DOUBLE_MAT3_EXT                0x8F47
-#define GL_DOUBLE_MAT4_EXT                0x8F48
-#define GL_DOUBLE_MAT2x3_EXT              0x8F49
-#define GL_DOUBLE_MAT2x4_EXT              0x8F4A
-#define GL_DOUBLE_MAT3x2_EXT              0x8F4B
-#define GL_DOUBLE_MAT3x4_EXT              0x8F4C
-#define GL_DOUBLE_MAT4x2_EXT              0x8F4D
-#define GL_DOUBLE_MAT4x3_EXT              0x8F4E
-#endif
-
-#ifndef GL_NV_gpu_program5
-#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A
-#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B
-#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C
-#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D
-#define GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV 0x8F44
-#define GL_MAX_PROGRAM_SUBROUTINE_NUM_NV  0x8F45
-#endif
-
-#ifndef GL_NV_gpu_shader5
-#define GL_INT64_NV                       0x140E
-#define GL_UNSIGNED_INT64_NV              0x140F
-#define GL_INT8_NV                        0x8FE0
-#define GL_INT8_VEC2_NV                   0x8FE1
-#define GL_INT8_VEC3_NV                   0x8FE2
-#define GL_INT8_VEC4_NV                   0x8FE3
-#define GL_INT16_NV                       0x8FE4
-#define GL_INT16_VEC2_NV                  0x8FE5
-#define GL_INT16_VEC3_NV                  0x8FE6
-#define GL_INT16_VEC4_NV                  0x8FE7
-#define GL_INT64_VEC2_NV                  0x8FE9
-#define GL_INT64_VEC3_NV                  0x8FEA
-#define GL_INT64_VEC4_NV                  0x8FEB
-#define GL_UNSIGNED_INT8_NV               0x8FEC
-#define GL_UNSIGNED_INT8_VEC2_NV          0x8FED
-#define GL_UNSIGNED_INT8_VEC3_NV          0x8FEE
-#define GL_UNSIGNED_INT8_VEC4_NV          0x8FEF
-#define GL_UNSIGNED_INT16_NV              0x8FF0
-#define GL_UNSIGNED_INT16_VEC2_NV         0x8FF1
-#define GL_UNSIGNED_INT16_VEC3_NV         0x8FF2
-#define GL_UNSIGNED_INT16_VEC4_NV         0x8FF3
-#define GL_UNSIGNED_INT64_VEC2_NV         0x8FF5
-#define GL_UNSIGNED_INT64_VEC3_NV         0x8FF6
-#define GL_UNSIGNED_INT64_VEC4_NV         0x8FF7
-#define GL_FLOAT16_NV                     0x8FF8
-#define GL_FLOAT16_VEC2_NV                0x8FF9
-#define GL_FLOAT16_VEC3_NV                0x8FFA
-#define GL_FLOAT16_VEC4_NV                0x8FFB
-/* reuse GL_PATCHES */
-#endif
-
-#ifndef GL_NV_shader_buffer_store
-#define GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV 0x00000010
-/* reuse GL_READ_WRITE */
-/* reuse GL_WRITE_ONLY */
-#endif
-
-#ifndef GL_NV_tessellation_program5
-#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV   0x86D8
-#define GL_TESS_CONTROL_PROGRAM_NV        0x891E
-#define GL_TESS_EVALUATION_PROGRAM_NV     0x891F
-#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74
-#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75
-#endif
-
-#ifndef GL_NV_vertex_attrib_integer_64bit
-/* reuse GL_INT64_NV */
-/* reuse GL_UNSIGNED_INT64_NV */
-#endif
-
-#ifndef GL_NV_multisample_coverage
-#define GL_COVERAGE_SAMPLES_NV            0x80A9
-#define GL_COLOR_SAMPLES_NV               0x8E20
-#endif
-
-#ifndef GL_AMD_name_gen_delete
-#define GL_DATA_BUFFER_AMD                0x9151
-#define GL_PERFORMANCE_MONITOR_AMD        0x9152
-#define GL_QUERY_OBJECT_AMD               0x9153
-#define GL_VERTEX_ARRAY_OBJECT_AMD        0x9154
-#define GL_SAMPLER_OBJECT_AMD             0x9155
-#endif
-
-#ifndef GL_AMD_debug_output
-#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD  0x9144
-#define GL_DEBUG_LOGGED_MESSAGES_AMD      0x9145
-#define GL_DEBUG_SEVERITY_HIGH_AMD        0x9146
-#define GL_DEBUG_SEVERITY_MEDIUM_AMD      0x9147
-#define GL_DEBUG_SEVERITY_LOW_AMD         0x9148
-#define GL_DEBUG_CATEGORY_API_ERROR_AMD   0x9149
-#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A
-#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B
-#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C
-#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D
-#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E
-#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F
-#define GL_DEBUG_CATEGORY_OTHER_AMD       0x9150
-#endif
-
-#ifndef GL_NV_vdpau_interop
-#define GL_SURFACE_STATE_NV               0x86EB
-#define GL_SURFACE_REGISTERED_NV          0x86FD
-#define GL_SURFACE_MAPPED_NV              0x8700
-#define GL_WRITE_DISCARD_NV               0x88BE
-#endif
-
-#ifndef GL_AMD_transform_feedback3_lines_triangles
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-#if defined(__APPLE__)
-typedef long GLintptr;
-typedef long GLsizeiptr;
-#else
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-#if defined(__APPLE__)
-typedef long GLintptrARB;
-typedef long GLsizeiptrARB;
-#else
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for program/shader text and shader object handles */
-typedef char GLcharARB;
-#if defined(__APPLE__)
-typedef void *GLhandleARB;
-#else
-typedef unsigned int GLhandleARB;
-#endif
-#endif
-
-/* GL type for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__) || defined(_LP64)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS ) || defined(__sgi)
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-/* Fallback if nothing above works */
-#include <inttypes.h>
-#endif
-#endif
-
-#ifndef GL_EXT_timer_query
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-#endif
-
-#ifndef GL_ARB_sync
-typedef int64_t GLint64;
-typedef uint64_t GLuint64;
-typedef struct __GLsync *GLsync;
-#endif
-
-#ifndef GL_ARB_cl_event
-/* These incomplete types let us declare types compatible with OpenCL's cl_context and cl_event */
-struct _cl_context;
-struct _cl_event;
-#endif
-
-#ifndef GL_ARB_debug_output
-typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
-#endif
-
-#ifndef GL_AMD_debug_output
-typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
-#endif
-
-#ifndef GL_NV_vdpau_interop
-typedef GLintptr GLvdpauSurfaceNV;
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GLAPI void APIENTRY glBlendEquation (GLenum mode);
-GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_2_DEPRECATED
-#define GL_VERSION_1_2_DEPRECATED 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, GLvoid *table);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, GLvoid *image);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink);
-GLAPI void APIENTRY glResetHistogram (GLenum target);
-GLAPI void APIENTRY glResetMinmax (GLenum target);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum texture);
-GLAPI void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_3_DEPRECATED
-#define GL_VERSION_1_3_DEPRECATED 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClientActiveTexture (GLenum texture);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
-GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_VERSION_1_4_DEPRECATED
-#define GL_VERSION_1_4_DEPRECATED 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordf (GLfloat coord);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord);
-GLAPI void APIENTRY glFogCoordd (GLdouble coord);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord);
-GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v);
-GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *v);
-GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *v);
-GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
-GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids);
-GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint id);
-GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id);
-GLAPI void APIENTRY glEndQuery (GLenum target);
-GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
-GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer);
-GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum target, GLenum access);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid* *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
-GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
-GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader);
-GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
-GLAPI void APIENTRY glCompileShader (GLuint shader);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum type);
-GLAPI void APIENTRY glDeleteProgram (GLuint program);
-GLAPI void APIENTRY glDeleteShader (GLuint shader);
-GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
-GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid* *pointer);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
-GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
-GLAPI void APIENTRY glLinkProgram (GLuint program);
-GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-GLAPI void APIENTRY glUseProgram (GLuint program);
-GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
-GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
-GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GLAPI void APIENTRY glUniform1i (GLint location, GLint v0);
-GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
-GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
-GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glValidateProgram (GLuint program);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_VERSION_2_1 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif
-
-#ifndef GL_VERSION_3_0
-#define GL_VERSION_3_0 1
-/* OpenGL 3.0 also reuses entry points from these extensions: */
-/* ARB_framebuffer_object */
-/* ARB_map_buffer_range */
-/* ARB_vertex_array_object */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data);
-GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data);
-GLAPI void APIENTRY glEnablei (GLenum target, GLuint index);
-GLAPI void APIENTRY glDisablei (GLenum target, GLuint index);
-GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index);
-GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
-GLAPI void APIENTRY glEndTransformFeedback (void);
-GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
-GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
-GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
-GLAPI void APIENTRY glEndConditionalRender (void);
-GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x);
-GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y);
-GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x);
-GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y);
-GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z);
-GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params);
-GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name);
-GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0);
-GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
-GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
-GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params);
-GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value);
-GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value);
-GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value);
-GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-GLAPI const GLubyte * APIENTRY glGetStringi (GLenum name, GLuint index);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
-typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
-typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
-#endif
-
-#ifndef GL_VERSION_3_1
-#define GL_VERSION_3_1 1
-/* OpenGL 3.1 also reuses entry points from these extensions: */
-/* ARB_copy_buffer */
-/* ARB_uniform_buffer_object */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer);
-GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
-#endif
-
-#ifndef GL_VERSION_3_2
-#define GL_VERSION_3_2 1
-/* OpenGL 3.2 also reuses entry points from these extensions: */
-/* ARB_draw_elements_base_vertex */
-/* ARB_provoking_vertex */
-/* ARB_sync */
-/* ARB_texture_multisample */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
-GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params);
-GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-#endif
-
-#ifndef GL_VERSION_3_3
-#define GL_VERSION_3_3 1
-/* OpenGL 3.3 also reuses entry points from these extensions: */
-/* ARB_blend_func_extended */
-/* ARB_sampler_objects */
-/* ARB_explicit_attrib_location, but it has none */
-/* ARB_occlusion_query2 (no entry points) */
-/* ARB_shader_bit_encoding (no entry points) */
-/* ARB_texture_rgb10_a2ui (no entry points) */
-/* ARB_texture_swizzle (no entry points) */
-/* ARB_timer_query */
-/* ARB_vertex_type_2_10_10_10_rev */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
-#endif
-
-#ifndef GL_VERSION_4_0
-#define GL_VERSION_4_0 1
-/* OpenGL 4.0 also reuses entry points from these extensions: */
-/* ARB_texture_query_lod (no entry points) */
-/* ARB_draw_indirect */
-/* ARB_gpu_shader5 (no entry points) */
-/* ARB_gpu_shader_fp64 */
-/* ARB_shader_subroutine */
-/* ARB_tessellation_shader */
-/* ARB_texture_buffer_object_rgb32 (no entry points) */
-/* ARB_texture_cube_map_array (no entry points) */
-/* ARB_texture_gather (no entry points) */
-/* ARB_transform_feedback2 */
-/* ARB_transform_feedback3 */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMinSampleShading (GLclampf value);
-GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
-GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
-GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLclampf value);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-#endif
-
-#ifndef GL_VERSION_4_1
-#define GL_VERSION_4_1 1
-/* OpenGL 4.1 also reuses entry points from these extensions: */
-/* ARB_ES2_compatibility */
-/* ARB_get_program_binary */
-/* ARB_separate_shader_objects */
-/* ARB_shader_precision (no entry points) */
-/* ARB_vertex_attrib_64bit */
-/* ARB_viewport_array */
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum texture);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf value, GLboolean invert);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, GLvoid *img);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights);
-GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights);
-GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights);
-GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights);
-GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights);
-GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights);
-GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights);
-GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights);
-GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glVertexBlendARB (GLint count);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x);
-GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x);
-GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x);
-GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y);
-GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index);
-GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index);
-GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program);
-GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs);
-GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs);
-GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
-GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
-GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
-GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
-GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params);
-GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params);
-GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params);
-GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params);
-GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, GLvoid *string);
-GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, GLvoid* *pointer);
-GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer);
-GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers);
-GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers);
-GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer);
-GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum target, GLenum access);
-GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target);
-GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, GLvoid* *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids);
-GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids);
-GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id);
-GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id);
-GLAPI void APIENTRY glEndQueryARB (GLenum target);
-GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj);
-GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname);
-GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj);
-GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType);
-GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj);
-GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
-GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj);
-GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj);
-GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj);
-GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj);
-GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0);
-GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1);
-GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0);
-GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1);
-GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2);
-GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name);
-GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params);
-GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params);
-GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
-#ifndef GL_ARB_depth_buffer_float
-#define GL_ARB_depth_buffer_float 1
-#endif
-
-#ifndef GL_ARB_draw_instanced
-#define GL_ARB_draw_instanced 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_ARB_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer);
-GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
-GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
-GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
-GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer);
-GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
-GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
-GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
-GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target);
-GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGenerateMipmap (GLenum target);
-GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-#endif
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_ARB_framebuffer_sRGB 1
-#endif
-
-#ifndef GL_ARB_geometry_shader4
-#define GL_ARB_geometry_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value);
-GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif
-
-#ifndef GL_ARB_half_float_vertex
-#define GL_ARB_half_float_vertex 1
-#endif
-
-#ifndef GL_ARB_instanced_arrays
-#define GL_ARB_instanced_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
-#endif
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_ARB_map_buffer_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
-#endif
-
-#ifndef GL_ARB_texture_buffer_object
-#define GL_ARB_texture_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-#endif
-
-#ifndef GL_ARB_texture_compression_rgtc
-#define GL_ARB_texture_compression_rgtc 1
-#endif
-
-#ifndef GL_ARB_texture_rg
-#define GL_ARB_texture_rg 1
-#endif
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_ARB_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArray (GLuint array);
-GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays);
-GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays);
-GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
-#endif
-
-#ifndef GL_ARB_uniform_buffer_object
-#define GL_ARB_uniform_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
-GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
-GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
-GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
-typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-#endif
-
-#ifndef GL_ARB_compatibility
-#define GL_ARB_compatibility 1
-#endif
-
-#ifndef GL_ARB_copy_buffer
-#define GL_ARB_copy_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-#endif
-
-#ifndef GL_ARB_shader_texture_lod
-#define GL_ARB_shader_texture_lod 1
-#endif
-
-#ifndef GL_ARB_depth_clamp
-#define GL_ARB_depth_clamp 1
-#endif
-
-#ifndef GL_ARB_draw_elements_base_vertex
-#define GL_ARB_draw_elements_base_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
-GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
-#endif
-
-#ifndef GL_ARB_fragment_coord_conventions
-#define GL_ARB_fragment_coord_conventions 1
-#endif
-
-#ifndef GL_ARB_provoking_vertex
-#define GL_ARB_provoking_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProvokingVertex (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_ARB_seamless_cube_map
-#define GL_ARB_seamless_cube_map 1
-#endif
-
-#ifndef GL_ARB_sync
-#define GL_ARB_sync 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags);
-GLAPI GLboolean APIENTRY glIsSync (GLsync sync);
-GLAPI void APIENTRY glDeleteSync (GLsync sync);
-GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *params);
-GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
-typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync);
-typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync);
-typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params);
-typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-#endif
-
-#ifndef GL_ARB_texture_multisample
-#define GL_ARB_texture_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val);
-GLAPI void APIENTRY glSampleMaski (GLuint index, GLbitfield mask);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
-typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask);
-#endif
-
-#ifndef GL_ARB_vertex_array_bgra
-#define GL_ARB_vertex_array_bgra 1
-#endif
-
-#ifndef GL_ARB_draw_buffers_blend
-#define GL_ARB_draw_buffers_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationiARB (GLuint buf, GLenum mode);
-GLAPI void APIENTRY glBlendEquationSeparateiARB (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-GLAPI void APIENTRY glBlendFunciARB (GLuint buf, GLenum src, GLenum dst);
-GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-#endif
-
-#ifndef GL_ARB_sample_shading
-#define GL_ARB_sample_shading 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMinSampleShadingARB (GLclampf value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLclampf value);
-#endif
-
-#ifndef GL_ARB_texture_cube_map_array
-#define GL_ARB_texture_cube_map_array 1
-#endif
-
-#ifndef GL_ARB_texture_gather
-#define GL_ARB_texture_gather 1
-#endif
-
-#ifndef GL_ARB_texture_query_lod
-#define GL_ARB_texture_query_lod 1
-#endif
-
-#ifndef GL_ARB_shading_language_include
-#define GL_ARB_shading_language_include 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
-GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name);
-GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length);
-GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name);
-GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
-GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
-typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length);
-typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
-typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_ARB_texture_compression_bptc
-#define GL_ARB_texture_compression_bptc 1
-#endif
-
-#ifndef GL_ARB_blend_func_extended
-#define GL_ARB_blend_func_extended 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
-#endif
-
-#ifndef GL_ARB_explicit_attrib_location
-#define GL_ARB_explicit_attrib_location 1
-#endif
-
-#ifndef GL_ARB_occlusion_query2
-#define GL_ARB_occlusion_query2 1
-#endif
-
-#ifndef GL_ARB_sampler_objects
-#define GL_ARB_sampler_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
-GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
-GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler);
-GLAPI void APIENTRY glBindSampler (GLuint unit, GLuint sampler);
-GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
-GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param);
-GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param);
-GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param);
-GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param);
-GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetSamplerParameterIuiv (GLuint sampler, GLenum pname, GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
-typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
-typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler);
-typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_texture_rgb10_a2ui
-#define GL_ARB_texture_rgb10_a2ui 1
-#endif
-
-#ifndef GL_ARB_texture_swizzle
-#define GL_ARB_texture_swizzle 1
-#endif
-
-#ifndef GL_ARB_timer_query
-#define GL_ARB_timer_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target);
-GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params);
-GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
-#endif
-
-#ifndef GL_ARB_vertex_type_2_10_10_10_rev
-#define GL_ARB_vertex_type_2_10_10_10_rev 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value);
-GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value);
-GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value);
-GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value);
-GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value);
-GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value);
-GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords);
-GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords);
-GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords);
-GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color);
-GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color);
-GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color);
-GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color);
-GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color);
-GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color);
-GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-#endif
-
-#ifndef GL_ARB_draw_indirect
-#define GL_ARB_draw_indirect 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const GLvoid *indirect);
-GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const GLvoid *indirect);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const GLvoid *indirect);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const GLvoid *indirect);
-#endif
-
-#ifndef GL_ARB_gpu_shader5
-#define GL_ARB_gpu_shader5 1
-#endif
-
-#ifndef GL_ARB_gpu_shader_fp64
-#define GL_ARB_gpu_shader_fp64 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x);
-GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
-typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
-#endif
-
-#ifndef GL_ARB_shader_subroutine
-#define GL_ARB_shader_subroutine 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name);
-GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name);
-GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
-GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices);
-GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params);
-GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
-typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
-typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
-#endif
-
-#ifndef GL_ARB_tessellation_shader
-#define GL_ARB_tessellation_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value);
-GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
-typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
-#endif
-
-#ifndef GL_ARB_texture_buffer_object_rgb32
-#define GL_ARB_texture_buffer_object_rgb32 1
-#endif
-
-#ifndef GL_ARB_transform_feedback2
-#define GL_ARB_transform_feedback2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
-GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids);
-GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids);
-GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id);
-GLAPI void APIENTRY glPauseTransformFeedback (void);
-GLAPI void APIENTRY glResumeTransformFeedback (void);
-GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
-typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
-#endif
-
-#ifndef GL_ARB_transform_feedback3
-#define GL_ARB_transform_feedback3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream);
-GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id);
-GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index);
-GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
-typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_ARB_ES2_compatibility
-#define GL_ARB_ES2_compatibility 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReleaseShaderCompiler (void);
-GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length);
-GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
-GLAPI void APIENTRY glDepthRangef (GLclampf n, GLclampf f);
-GLAPI void APIENTRY glClearDepthf (GLclampf d);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void);
-typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length);
-typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
-typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLclampf n, GLclampf f);
-typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLclampf d);
-#endif
-
-#ifndef GL_ARB_get_program_binary
-#define GL_ARB_get_program_binary 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetProgramBinary (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
-GLAPI void APIENTRY glProgramBinary (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
-GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
-typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
-#endif
-
-#ifndef GL_ARB_separate_shader_objects
-#define GL_ARB_separate_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUseProgramStages (GLuint pipeline, GLbitfield stages, GLuint program);
-GLAPI void APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program);
-GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar* *strings);
-GLAPI void APIENTRY glBindProgramPipeline (GLuint pipeline);
-GLAPI void APIENTRY glDeleteProgramPipelines (GLsizei n, const GLuint *pipelines);
-GLAPI void APIENTRY glGenProgramPipelines (GLsizei n, GLuint *pipelines);
-GLAPI GLboolean APIENTRY glIsProgramPipeline (GLuint pipeline);
-GLAPI void APIENTRY glGetProgramPipelineiv (GLuint pipeline, GLenum pname, GLint *params);
-GLAPI void APIENTRY glProgramUniform1i (GLuint program, GLint location, GLint v0);
-GLAPI void APIENTRY glProgramUniform1iv (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniform1f (GLuint program, GLint location, GLfloat v0);
-GLAPI void APIENTRY glProgramUniform1fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform1d (GLuint program, GLint location, GLdouble v0);
-GLAPI void APIENTRY glProgramUniform1dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform1ui (GLuint program, GLint location, GLuint v0);
-GLAPI void APIENTRY glProgramUniform1uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glProgramUniform2i (GLuint program, GLint location, GLint v0, GLint v1);
-GLAPI void APIENTRY glProgramUniform2iv (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniform2f (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-GLAPI void APIENTRY glProgramUniform2fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform2d (GLuint program, GLint location, GLdouble v0, GLdouble v1);
-GLAPI void APIENTRY glProgramUniform2dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform2ui (GLuint program, GLint location, GLuint v0, GLuint v1);
-GLAPI void APIENTRY glProgramUniform2uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glProgramUniform3i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-GLAPI void APIENTRY glProgramUniform3iv (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniform3f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GLAPI void APIENTRY glProgramUniform3fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform3d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
-GLAPI void APIENTRY glProgramUniform3dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform3ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-GLAPI void APIENTRY glProgramUniform3uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glProgramUniform4i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GLAPI void APIENTRY glProgramUniform4iv (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniform4f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GLAPI void APIENTRY glProgramUniform4fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform4d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
-GLAPI void APIENTRY glProgramUniform4dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform4ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GLAPI void APIENTRY glProgramUniform4uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glProgramUniformMatrix2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glValidateProgramPipeline (GLuint pipeline);
-GLAPI void APIENTRY glGetProgramPipelineInfoLog (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
-typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar* *strings);
-typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines);
-typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline);
-typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline);
-typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-#endif
-
-#ifndef GL_ARB_vertex_attrib_64bit
-#define GL_ARB_vertex_attrib_64bit 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribL1d (GLuint index, GLdouble x);
-GLAPI void APIENTRY glVertexAttribL2d (GLuint index, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexAttribL3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexAttribL4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexAttribL1dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribL2dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribL3dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribL4dv (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribLPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-#endif
-
-#ifndef GL_ARB_viewport_array
-#define GL_ARB_viewport_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glViewportArrayv (GLuint first, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glViewportIndexedf (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
-GLAPI void APIENTRY glViewportIndexedfv (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glScissorArrayv (GLuint first, GLsizei count, const GLint *v);
-GLAPI void APIENTRY glScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glScissorIndexedv (GLuint index, const GLint *v);
-GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLclampd *v);
-GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLclampd n, GLclampd f);
-GLAPI void APIENTRY glGetFloati_v (GLenum target, GLuint index, GLfloat *data);
-GLAPI void APIENTRY glGetDoublei_v (GLenum target, GLuint index, GLdouble *data);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
-typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v);
-typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLclampd *v);
-typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLclampd n, GLclampd f);
-typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data);
-#endif
-
-#ifndef GL_ARB_cl_event
-#define GL_ARB_cl_event 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLsync APIENTRY glCreateSyncFromCLeventARB (struct _cl_context * context, struct _cl_event * event, GLbitfield flags);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context * context, struct _cl_event * event, GLbitfield flags);
-#endif
-
-#ifndef GL_ARB_debug_output
-#define GL_ARB_debug_output 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const GLvoid *userParam);
-GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const GLvoid *userParam);
-typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-#endif
-
-#ifndef GL_ARB_robustness
-#define GL_ARB_robustness 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLenum APIENTRY glGetGraphicsResetStatusARB (void);
-GLAPI void APIENTRY glGetnMapdvARB (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
-GLAPI void APIENTRY glGetnMapfvARB (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
-GLAPI void APIENTRY glGetnMapivARB (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
-GLAPI void APIENTRY glGetnPixelMapfvARB (GLenum map, GLsizei bufSize, GLfloat *values);
-GLAPI void APIENTRY glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint *values);
-GLAPI void APIENTRY glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort *values);
-GLAPI void APIENTRY glGetnPolygonStippleARB (GLsizei bufSize, GLubyte *pattern);
-GLAPI void APIENTRY glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table);
-GLAPI void APIENTRY glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image);
-GLAPI void APIENTRY glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span);
-GLAPI void APIENTRY glGetnHistogramARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values);
-GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values);
-GLAPI void APIENTRY glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img);
-GLAPI void APIENTRY glReadnPixelsARB (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data);
-GLAPI void APIENTRY glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img);
-GLAPI void APIENTRY glGetnUniformfvARB (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
-GLAPI void APIENTRY glGetnUniformivARB (GLuint program, GLint location, GLsizei bufSize, GLint *params);
-GLAPI void APIENTRY glGetnUniformuivARB (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
-GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void);
-typedef void (APIENTRYP PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
-typedef void (APIENTRYP PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
-typedef void (APIENTRYP PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
-typedef void (APIENTRYP PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values);
-typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values);
-typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values);
-typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern);
-typedef void (APIENTRYP PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img);
-typedef void (APIENTRYP PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img);
-typedef void (APIENTRYP PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
-typedef void (APIENTRYP PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
-typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
-#endif
-
-#ifndef GL_ARB_shader_stencil_export
-#define GL_ARB_shader_stencil_export 1
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum target);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum target);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *image);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_SGI_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, GLvoid *table);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences);
-GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint i);
-GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer);
-GLAPI void APIENTRY glGetPointervEXT (GLenum pname, GLvoid* *params);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint factor);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield mask);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, GLvoid *data);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum mode);
-GLAPI void APIENTRY glTextureLightEXT (GLenum pname);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const GLvoid* *pointer);
-GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v);
-GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *v);
-GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *v);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v);
-GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const GLvoid *pointer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param);
-GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const GLvoid *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
-GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence);
-GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
-GLAPI void APIENTRY glFinishFenceNV (GLuint fence);
-GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences);
-GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, GLvoid* *pointer);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id);
-GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle);
-GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const GLvoid *pointer, GLenum usage);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params);
-GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer);
-GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const GLvoid *addr);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const GLvoid *addr);
-GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr);
-GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr);
-GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr);
-GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr);
-GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr);
-GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr);
-GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr);
-GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, GLvoid* *data);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum type, const GLvoid *pointer);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param);
-GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const GLvoid *pointer);
-GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count);
-GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences);
-GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences);
-GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence);
-GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence);
-GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence);
-GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence);
-GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name);
-GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
-typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array);
-GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays);
-GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays);
-GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer);
-GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer);
-GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_ATI_pixel_format_float 1
-/* This is really a WGL extension, but defines some associated GL enums.
- * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
- */
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
-GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s);
-GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t);
-GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s);
-GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v);
-GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t);
-GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v);
-GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
-GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
-GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
-GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
-GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
-GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
-typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, GLvoid *pointer);
-GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveRestartNV (void);
-GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-#endif
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint buffer);
-GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-#endif
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer);
-GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer);
-GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers);
-GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers);
-GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer);
-GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer);
-GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers);
-GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers);
-GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target);
-GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const GLvoid *string);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_EXT_packed_depth_stencil 1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_EXT_stencil_clear_tag 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_EXT_texture_sRGB 1
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_EXT_framebuffer_blit 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_EXT_framebuffer_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_MESAX_texture_stack 1
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_EXT_timer_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64EXT *params);
-GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64EXT *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#define GL_EXT_gpu_program_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_APPLE_flush_buffer_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_NV_gpu_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
-GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
-GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
-GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
-GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
-GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
-GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params);
-GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params);
-GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params);
-GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_NV_geometry_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit);
-GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level);
-GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_EXT_geometry_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_NV_vertex_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x);
-GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y);
-GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x);
-GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y);
-GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z);
-GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_EXT_gpu_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params);
-GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name);
-GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0);
-GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1);
-GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2);
-GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#define GL_EXT_draw_instanced 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_EXT_packed_float 1
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_EXT_texture_array 1
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_EXT_texture_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_EXT_texture_compression_latc 1
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_EXT_texture_compression_rgtc 1
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_EXT_texture_shared_exponent 1
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_NV_depth_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar);
-GLAPI void APIENTRY glClearDepthdNV (GLdouble depth);
-GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
-#endif
-
-#ifndef GL_NV_fragment_program4
-#define GL_NV_fragment_program4 1
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_NV_framebuffer_multisample_coverage 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_EXT_framebuffer_sRGB 1
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#define GL_NV_geometry_shader4 1
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_NV_parameter_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
-GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
-GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#define GL_EXT_draw_buffers2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data);
-GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data);
-GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index);
-GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index);
-GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_NV_transform_feedback 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode);
-GLAPI void APIENTRY glEndTransformFeedbackNV (void);
-GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint count, const GLint *attribs, GLenum bufferMode);
-GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer);
-GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
-GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name);
-GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name);
-GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location);
-GLAPI void APIENTRY glTransformFeedbackStreamAttribsNV (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKSTREAMATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_EXT_bindable_uniform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer);
-GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location);
-GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
-typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_EXT_texture_integer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params);
-GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha);
-GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
-typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-#endif
-
-#ifndef GL_GREMEDY_frame_terminator
-#define GL_GREMEDY_frame_terminator 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
-#endif
-
-#ifndef GL_NV_conditional_render
-#define GL_NV_conditional_render 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode);
-GLAPI void APIENTRY glEndConditionalRenderNV (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
-typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
-#endif
-
-#ifndef GL_NV_present_video
-#define GL_NV_present_video 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
-GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
-GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params);
-GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
-typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
-typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params);
-typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params);
-#endif
-
-#ifndef GL_EXT_transform_feedback
-#define GL_EXT_transform_feedback 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode);
-GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
-GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer);
-GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-#endif
-
-#ifndef GL_EXT_direct_state_access
-#define GL_EXT_direct_state_access 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask);
-GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask);
-GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
-GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
-GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
-GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
-GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
-GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GLAPI void APIENTRY glMatrixPopEXT (GLenum mode);
-GLAPI void APIENTRY glMatrixPushEXT (GLenum mode);
-GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
-GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
-GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
-GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
-GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
-GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
-GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture);
-GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index);
-GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index);
-GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
-GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
-GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
-GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param);
-GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data);
-GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data);
-GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, GLvoid* *data);
-GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, GLvoid *img);
-GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
-GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params);
-GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params);
-GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, GLvoid *string);
-GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params);
-GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params);
-GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params);
-GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
-GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
-GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0);
-GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0);
-GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1);
-GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0);
-GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1);
-GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
-GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-GLAPI GLvoid* APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access);
-GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer);
-GLAPI GLvoid* APIENTRY glMapNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
-GLAPI void APIENTRY glFlushMappedNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length);
-GLAPI void APIENTRY glNamedCopyBufferSubDataEXT (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, GLvoid* *params);
-GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
-GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
-GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
-GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params);
-GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target);
-GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target);
-GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target);
-GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode);
-GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs);
-GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode);
-GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
-GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
-GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
-GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
-GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer);
-GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer);
-GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x);
-GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
-typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
-typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
-typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid* *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, GLvoid *img);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
-typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
-typedef void (APIENTRYP PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
-typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
-typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
-typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-#endif
-
-#ifndef GL_EXT_vertex_array_bgra
-#define GL_EXT_vertex_array_bgra 1
-#endif
-
-#ifndef GL_EXT_texture_swizzle
-#define GL_EXT_texture_swizzle 1
-#endif
-
-#ifndef GL_NV_explicit_multisample
-#define GL_NV_explicit_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val);
-GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask);
-GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val);
-typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
-typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
-#endif
-
-#ifndef GL_NV_transform_feedback2
-#define GL_NV_transform_feedback2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id);
-GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids);
-GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids);
-GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id);
-GLAPI void APIENTRY glPauseTransformFeedbackNV (void);
-GLAPI void APIENTRY glResumeTransformFeedbackNV (void);
-GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids);
-typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
-#endif
-
-#ifndef GL_ATI_meminfo
-#define GL_ATI_meminfo 1
-#endif
-
-#ifndef GL_AMD_performance_monitor
-#define GL_AMD_performance_monitor 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
-GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
-GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
-GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
-GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data);
-GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
-GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
-GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
-GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
-GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor);
-GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
-typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
-typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
-typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
-typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data);
-typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
-typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
-typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
-typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
-typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
-typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
-#endif
-
-#ifndef GL_AMD_texture_texture4
-#define GL_AMD_texture_texture4 1
-#endif
-
-#ifndef GL_AMD_vertex_shader_tesselator
-#define GL_AMD_vertex_shader_tesselator 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor);
-GLAPI void APIENTRY glTessellationModeAMD (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_provoking_vertex
-#define GL_EXT_provoking_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_texture_snorm
-#define GL_EXT_texture_snorm 1
-#endif
-
-#ifndef GL_AMD_draw_buffers_blend
-#define GL_AMD_draw_buffers_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst);
-GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode);
-GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_APPLE_texture_range
-#define GL_APPLE_texture_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const GLvoid *pointer);
-GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, GLvoid* *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_APPLE_float_pixels
-#define GL_APPLE_float_pixels 1
-#endif
-
-#ifndef GL_APPLE_vertex_program_evaluators
-#define GL_APPLE_vertex_program_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname);
-GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname);
-GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname);
-GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname);
-typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-#endif
-
-#ifndef GL_APPLE_aux_depth_stencil
-#define GL_APPLE_aux_depth_stencil 1
-#endif
-
-#ifndef GL_APPLE_object_purgeable
-#define GL_APPLE_object_purgeable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
-GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
-GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
-typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_APPLE_row_bytes
-#define GL_APPLE_row_bytes 1
-#endif
-
-#ifndef GL_APPLE_rgb_422
-#define GL_APPLE_rgb_422 1
-#endif
-
-#ifndef GL_NV_video_capture
-#define GL_NV_video_capture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot);
-GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
-GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
-GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot);
-GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
-GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
-GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
-typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
-typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
-typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
-typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
-typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
-#endif
-
-#ifndef GL_NV_copy_image
-#define GL_NV_copy_image 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
-#endif
-
-#ifndef GL_EXT_separate_shader_objects
-#define GL_EXT_separate_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program);
-GLAPI void APIENTRY glActiveProgramEXT (GLuint program);
-GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
-typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string);
-#endif
-
-#ifndef GL_NV_parameter_buffer_object2
-#define GL_NV_parameter_buffer_object2 1
-#endif
-
-#ifndef GL_NV_shader_buffer_load
-#define GL_NV_shader_buffer_load 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access);
-GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target);
-GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target);
-GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access);
-GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer);
-GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer);
-GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params);
-GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params);
-GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result);
-GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value);
-GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
-GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params);
-GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value);
-GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
-typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
-typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer);
-typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params);
-typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result);
-typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
-typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
-typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-#endif
-
-#ifndef GL_NV_vertex_buffer_unified_memory
-#define GL_NV_vertex_buffer_unified_memory 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
-GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride);
-GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride);
-GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride);
-GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride);
-GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
-GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
-GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
-typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
-typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result);
-#endif
-
-#ifndef GL_NV_texture_barrier
-#define GL_NV_texture_barrier 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureBarrierNV (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void);
-#endif
-
-#ifndef GL_AMD_shader_stencil_export
-#define GL_AMD_shader_stencil_export 1
-#endif
-
-#ifndef GL_AMD_seamless_cubemap_per_texture
-#define GL_AMD_seamless_cubemap_per_texture 1
-#endif
-
-#ifndef GL_AMD_conservative_depth
-#define GL_AMD_conservative_depth 1
-#endif
-
-#ifndef GL_EXT_shader_image_load_store
-#define GL_EXT_shader_image_load_store 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindImageTextureEXT (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
-GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
-typedef void (APIENTRYP PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers);
-#endif
-
-#ifndef GL_EXT_vertex_attrib_64bit
-#define GL_EXT_vertex_attrib_64bit 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribL1dEXT (GLuint index, GLdouble x);
-GLAPI void APIENTRY glVertexAttribL2dEXT (GLuint index, GLdouble x, GLdouble y);
-GLAPI void APIENTRY glVertexAttribL3dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glVertexAttribL4dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glVertexAttribL1dvEXT (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribL2dvEXT (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribL3dvEXT (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribL4dvEXT (GLuint index, const GLdouble *v);
-GLAPI void APIENTRY glVertexAttribLPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void APIENTRY glGetVertexAttribLdvEXT (GLuint index, GLenum pname, GLdouble *params);
-GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
-#endif
-
-#ifndef GL_NV_gpu_program5
-#define GL_NV_gpu_program5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramSubroutineParametersuivNV (GLenum target, GLsizei count, const GLuint *params);
-GLAPI void APIENTRY glGetProgramSubroutineParameteruivNV (GLenum target, GLuint index, GLuint *param);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMSUBROUTINEPARAMETERSUIVNVPROC) (GLenum target, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSUBROUTINEPARAMETERUIVNVPROC) (GLenum target, GLuint index, GLuint *param);
-#endif
-
-#ifndef GL_NV_gpu_shader5
-#define GL_NV_gpu_shader5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x);
-GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y);
-GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
-GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
-GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
-GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
-GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
-GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
-GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x);
-GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y);
-GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
-GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
-GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
-GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
-GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
-GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
-GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params);
-GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x);
-GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
-GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
-GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
-GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
-GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
-GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
-GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
-GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x);
-GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
-GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
-GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
-GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
-typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
-typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
-typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
-typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
-typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
-typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
-typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
-typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x);
-typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y);
-typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
-typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
-typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
-typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
-#endif
-
-#ifndef GL_NV_shader_buffer_store
-#define GL_NV_shader_buffer_store 1
-#endif
-
-#ifndef GL_NV_tessellation_program5
-#define GL_NV_tessellation_program5 1
-#endif
-
-#ifndef GL_NV_vertex_attrib_integer_64bit
-#define GL_NV_vertex_attrib_integer_64bit 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribL1i64NV (GLuint index, GLint64EXT x);
-GLAPI void APIENTRY glVertexAttribL2i64NV (GLuint index, GLint64EXT x, GLint64EXT y);
-GLAPI void APIENTRY glVertexAttribL3i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
-GLAPI void APIENTRY glVertexAttribL4i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
-GLAPI void APIENTRY glVertexAttribL1i64vNV (GLuint index, const GLint64EXT *v);
-GLAPI void APIENTRY glVertexAttribL2i64vNV (GLuint index, const GLint64EXT *v);
-GLAPI void APIENTRY glVertexAttribL3i64vNV (GLuint index, const GLint64EXT *v);
-GLAPI void APIENTRY glVertexAttribL4i64vNV (GLuint index, const GLint64EXT *v);
-GLAPI void APIENTRY glVertexAttribL1ui64NV (GLuint index, GLuint64EXT x);
-GLAPI void APIENTRY glVertexAttribL2ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y);
-GLAPI void APIENTRY glVertexAttribL3ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
-GLAPI void APIENTRY glVertexAttribL4ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
-GLAPI void APIENTRY glVertexAttribL1ui64vNV (GLuint index, const GLuint64EXT *v);
-GLAPI void APIENTRY glVertexAttribL2ui64vNV (GLuint index, const GLuint64EXT *v);
-GLAPI void APIENTRY glVertexAttribL3ui64vNV (GLuint index, const GLuint64EXT *v);
-GLAPI void APIENTRY glVertexAttribL4ui64vNV (GLuint index, const GLuint64EXT *v);
-GLAPI void APIENTRY glGetVertexAttribLi64vNV (GLuint index, GLenum pname, GLint64EXT *params);
-GLAPI void APIENTRY glGetVertexAttribLui64vNV (GLuint index, GLenum pname, GLuint64EXT *params);
-GLAPI void APIENTRY glVertexAttribLFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
-#endif
-
-#ifndef GL_NV_multisample_coverage
-#define GL_NV_multisample_coverage 1
-#endif
-
-#ifndef GL_AMD_name_gen_delete
-#define GL_AMD_name_gen_delete 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenNamesAMD (GLenum identifier, GLuint num, GLuint *names);
-GLAPI void APIENTRY glDeleteNamesAMD (GLenum identifier, GLuint num, const GLuint *names);
-GLAPI GLboolean APIENTRY glIsNameAMD (GLenum identifier, GLuint name);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint *names);
-typedef void (APIENTRYP PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint *names);
-typedef GLboolean (APIENTRYP PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name);
-#endif
-
-#ifndef GL_AMD_debug_output
-#define GL_AMD_debug_output 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
-GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, GLvoid *userParam);
-GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
-typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, GLvoid *userParam);
-typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
-#endif
-
-#ifndef GL_NV_vdpau_interop
-#define GL_NV_vdpau_interop 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVDPAUInitNV (const GLvoid *vdpDevice, const GLvoid *getProcAddress);
-GLAPI void APIENTRY glVDPAUFiniNV (void);
-GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
-GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
-GLAPI void APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface);
-GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface);
-GLAPI void APIENTRY glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-GLAPI void APIENTRY glVDPAUSurfaceAccessNV (GLvdpauSurfaceNV surface, GLenum access);
-GLAPI void APIENTRY glVDPAUMapSurfacesNV (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
-GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const GLvoid *vdpDevice, const GLvoid *getProcAddress);
-typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void);
-typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
-typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
-typedef void (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface);
-typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface);
-typedef void (APIENTRYP PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-typedef void (APIENTRYP PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access);
-typedef void (APIENTRYP PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
-typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
-#endif
-
-#ifndef GL_AMD_transform_feedback3_lines_triangles
-#define GL_AMD_transform_feedback3_lines_triangles 1
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-#endif /* NO_SDL_GLEXT */
-
-#endif /* !__IPHONEOS__ */
-
-#endif /* _SDL_opengl_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_opengles.h b/linux-x86/include/SDL2/SDL_opengles.h
deleted file mode 100644
index d88e157..0000000
--- a/linux-x86/include/SDL2/SDL_opengles.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_opengles.h
- *
- *  This is a simple file to encapsulate the OpenGL ES 1.X API headers.
- */
-
-#ifdef __IPHONEOS__
-#include <OpenGLES/ES1/gl.h>
-#include <OpenGLES/ES1/glext.h>
-#else
-#include <GLES/gl.h>
-#include <GLES/glext.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
diff --git a/linux-x86/include/SDL2/SDL_opengles2.h b/linux-x86/include/SDL2/SDL_opengles2.h
deleted file mode 100644
index 2c05479..0000000
--- a/linux-x86/include/SDL2/SDL_opengles2.h
+++ /dev/null
@@ -1,2790 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_opengles.h
- *
- *  This is a simple file to encapsulate the OpenGL ES 2.0 API headers.
- */
-#ifndef _MSC_VER
-#ifdef __IPHONEOS__
-#include <OpenGLES/ES2/gl.h>
-#include <OpenGLES/ES2/glext.h>
-#else
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#endif
-
-#else /* _MSC_VER */
-
-/* OpenGL ES2 headers for Visual Studio */
-
-#ifndef __khrplatform_h_
-#define __khrplatform_h_
-
-/*
-** Copyright (c) 2008-2009 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-/* Khronos platform-specific types and definitions.
-*
-* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
-*
-* Adopters may modify this file to suit their platform. Adopters are
-* encouraged to submit platform specific modifications to the Khronos
-* group so that they can be included in future versions of this file.
-* Please submit changes by sending them to the public Khronos Bugzilla
-* (http://khronos.org/bugzilla) by filing a bug against product
-* "Khronos (general)" component "Registry".
-*
-* A predefined template which fills in some of the bug fields can be
-* reached using http://tinyurl.com/khrplatform-h-bugreport, but you
-* must create a Bugzilla login first.
-*
-*
-* See the Implementer's Guidelines for information about where this file
-* should be located on your system and for more details of its use:
-*    http://www.khronos.org/registry/implementers_guide.pdf
-*
-* This file should be included as
-*        #include <KHR/khrplatform.h>
-* by Khronos client API header files that use its types and defines.
-*
-* The types in khrplatform.h should only be used to define API-specific types.
-*
-* Types defined in khrplatform.h:
-*    khronos_int8_t              signed   8  bit
-*    khronos_uint8_t             unsigned 8  bit
-*    khronos_int16_t             signed   16 bit
-*    khronos_uint16_t            unsigned 16 bit
-*    khronos_int32_t             signed   32 bit
-*    khronos_uint32_t            unsigned 32 bit
-*    khronos_int64_t             signed   64 bit
-*    khronos_uint64_t            unsigned 64 bit
-*    khronos_intptr_t            signed   same number of bits as a pointer
-*    khronos_uintptr_t           unsigned same number of bits as a pointer
-*    khronos_ssize_t             signed   size
-*    khronos_usize_t             unsigned size
-*    khronos_float_t             signed   32 bit floating point
-*    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
-*    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
-*                                         nanoseconds
-*    khronos_stime_nanoseconds_t signed time interval in nanoseconds
-*    khronos_boolean_enum_t      enumerated boolean type. This should
-*      only be used as a base type when a client API's boolean type is
-*      an enum. Client APIs which use an integer or other type for
-*      booleans cannot use this as the base type for their boolean.
-*
-* Tokens defined in khrplatform.h:
-*
-*    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
-*
-*    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
-*    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
-*
-* Calling convention macros defined in this file:
-*    KHRONOS_APICALL
-*    KHRONOS_APIENTRY
-*    KHRONOS_APIATTRIBUTES
-*
-* These may be used in function prototypes as:
-*
-*      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
-*                                  int arg1,
-*                                  int arg2) KHRONOS_APIATTRIBUTES;
-*/
-
-/*-------------------------------------------------------------------------
-* Definition of KHRONOS_APICALL
-*-------------------------------------------------------------------------
-* This precedes the return type of the function in the function prototype.
-*/
-#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
-#   define KHRONOS_APICALL __declspec(dllimport)
-#elif defined (__SYMBIAN32__)
-#   define KHRONOS_APICALL IMPORT_C
-#else
-#   define KHRONOS_APICALL
-#endif
-
-/*-------------------------------------------------------------------------
-* Definition of KHRONOS_APIENTRY
-*-------------------------------------------------------------------------
-* This follows the return type of the function  and precedes the function
-* name in the function prototype.
-*/
-#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
-/* Win32 but not WinCE */
-#   define KHRONOS_APIENTRY __stdcall
-#else
-#   define KHRONOS_APIENTRY
-#endif
-
-/*-------------------------------------------------------------------------
-* Definition of KHRONOS_APIATTRIBUTES
-*-------------------------------------------------------------------------
-* This follows the closing parenthesis of the function prototype arguments.
-*/
-#if defined (__ARMCC_2__)
-#define KHRONOS_APIATTRIBUTES __softfp
-#else
-#define KHRONOS_APIATTRIBUTES
-#endif
-
-/*-------------------------------------------------------------------------
-* basic type definitions
-*-----------------------------------------------------------------------*/
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
-
-
-/*
-* Using <stdint.h>
-*/
-#include <stdint.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(__VMS ) || defined(__sgi)
-
-/*
-* Using <inttypes.h>
-*/
-#include <inttypes.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
-
-/*
-* Win32
-*/
-typedef __int32                 khronos_int32_t;
-typedef unsigned __int32        khronos_uint32_t;
-typedef __int64                 khronos_int64_t;
-typedef unsigned __int64        khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(__sun__) || defined(__digital__)
-
-/*
-* Sun or Digital
-*/
-typedef int                     khronos_int32_t;
-typedef unsigned int            khronos_uint32_t;
-#if defined(__arch64__) || defined(_LP64)
-typedef long int                khronos_int64_t;
-typedef unsigned long int       khronos_uint64_t;
-#else
-typedef long long int           khronos_int64_t;
-typedef unsigned long long int  khronos_uint64_t;
-#endif /* __arch64__ */
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif 0
-
-/*
-* Hypothetical platform with no float or int64 support
-*/
-typedef int                     khronos_int32_t;
-typedef unsigned int            khronos_uint32_t;
-#define KHRONOS_SUPPORT_INT64   0
-#define KHRONOS_SUPPORT_FLOAT   0
-
-#else
-
-/*
-* Generic fallback
-*/
-#include <stdint.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#endif
-
-
-/*
-* Types that are (so far) the same on all platforms
-*/
-typedef signed   char          khronos_int8_t;
-typedef unsigned char          khronos_uint8_t;
-typedef signed   short int     khronos_int16_t;
-typedef unsigned short int     khronos_uint16_t;
-
-/*
-* Types that differ between LLP64 and LP64 architectures - in LLP64,
-* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
-* to be the only LLP64 architecture in current use.
-*/
-#ifdef _WIN64
-typedef signed   long long int khronos_intptr_t;
-typedef unsigned long long int khronos_uintptr_t;
-typedef signed   long long int khronos_ssize_t;
-typedef unsigned long long int khronos_usize_t;
-#else
-typedef signed   long  int     khronos_intptr_t;
-typedef unsigned long  int     khronos_uintptr_t;
-typedef signed   long  int     khronos_ssize_t;
-typedef unsigned long  int     khronos_usize_t;
-#endif
-
-#if KHRONOS_SUPPORT_FLOAT
-/*
-* Float type
-*/
-typedef          float         khronos_float_t;
-#endif
-
-#if KHRONOS_SUPPORT_INT64
-/* Time types
-*
-* These types can be used to represent a time interval in nanoseconds or
-* an absolute Unadjusted System Time.  Unadjusted System Time is the number
-* of nanoseconds since some arbitrary system event (e.g. since the last
-* time the system booted).  The Unadjusted System Time is an unsigned
-* 64 bit value that wraps back to 0 every 584 years.  Time intervals
-* may be either signed or unsigned.
-*/
-typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
-typedef khronos_int64_t        khronos_stime_nanoseconds_t;
-#endif
-
-/*
-* Dummy value used to pad enum types to 32 bits.
-*/
-#ifndef KHRONOS_MAX_ENUM
-#define KHRONOS_MAX_ENUM 0x7FFFFFFF
-#endif
-
-/*
-* Enumerated boolean type
-*
-* Values other than zero should be considered to be true.  Therefore
-* comparisons should not be made against KHRONOS_TRUE.
-*/
-typedef enum {
-    KHRONOS_FALSE = 0,
-    KHRONOS_TRUE = 1,
-    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
-} khronos_boolean_enum_t;
-
-#endif /* __khrplatform_h_ */
-
-
-#ifndef __gl2platform_h_
-#define __gl2platform_h_
-
-/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-/* Platform-specific types and definitions for OpenGL ES 2.X  gl2.h
- *
- * Adopters may modify khrplatform.h and this file to suit their platform.
- * You are encouraged to submit all modifications to the Khronos group so that
- * they can be included in future versions of this file.  Please submit changes
- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
- * by filing a bug against product "OpenGL-ES" component "Registry".
- */
-
-/*#include <KHR/khrplatform.h>*/
-
-#ifndef GL_APICALL
-#define GL_APICALL  KHRONOS_APICALL
-#endif
-
-#ifndef GL_APIENTRY
-#define GL_APIENTRY KHRONOS_APIENTRY
-#endif
-
-#endif /* __gl2platform_h_ */
-
-#ifndef __gl2_h_
-#define __gl2_h_
-
-/* $Revision: 16803 $ on $Date:: 2012-02-02 09:49:18 -0800 #$ */
-
-/*#include <GLES2/gl2platform.h>*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-/*-------------------------------------------------------------------------
- * Data type definitions
- *-----------------------------------------------------------------------*/
-
-typedef void             GLvoid;
-typedef char             GLchar;
-typedef unsigned int     GLenum;
-typedef unsigned char    GLboolean;
-typedef unsigned int     GLbitfield;
-typedef khronos_int8_t   GLbyte;
-typedef short            GLshort;
-typedef int              GLint;
-typedef int              GLsizei;
-typedef khronos_uint8_t  GLubyte;
-typedef unsigned short   GLushort;
-typedef unsigned int     GLuint;
-typedef khronos_float_t  GLfloat;
-typedef khronos_float_t  GLclampf;
-typedef khronos_int32_t  GLfixed;
-
-/* GL types for handling large vertex buffer objects */
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
-
-/* OpenGL ES core versions */
-#define GL_ES_VERSION_2_0                 1
-
-/* ClearBufferMask */
-#define GL_DEPTH_BUFFER_BIT               0x00000100
-#define GL_STENCIL_BUFFER_BIT             0x00000400
-#define GL_COLOR_BUFFER_BIT               0x00004000
-
-/* Boolean */
-#define GL_FALSE                          0
-#define GL_TRUE                           1
-
-/* BeginMode */
-#define GL_POINTS                         0x0000
-#define GL_LINES                          0x0001
-#define GL_LINE_LOOP                      0x0002
-#define GL_LINE_STRIP                     0x0003
-#define GL_TRIANGLES                      0x0004
-#define GL_TRIANGLE_STRIP                 0x0005
-#define GL_TRIANGLE_FAN                   0x0006
-
-/* AlphaFunction (not supported in ES20) */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* BlendingFactorDest */
-#define GL_ZERO                           0
-#define GL_ONE                            1
-#define GL_SRC_COLOR                      0x0300
-#define GL_ONE_MINUS_SRC_COLOR            0x0301
-#define GL_SRC_ALPHA                      0x0302
-#define GL_ONE_MINUS_SRC_ALPHA            0x0303
-#define GL_DST_ALPHA                      0x0304
-#define GL_ONE_MINUS_DST_ALPHA            0x0305
-
-/* BlendingFactorSrc */
-/*      GL_ZERO */
-/*      GL_ONE */
-#define GL_DST_COLOR                      0x0306
-#define GL_ONE_MINUS_DST_COLOR            0x0307
-#define GL_SRC_ALPHA_SATURATE             0x0308
-/*      GL_SRC_ALPHA */
-/*      GL_ONE_MINUS_SRC_ALPHA */
-/*      GL_DST_ALPHA */
-/*      GL_ONE_MINUS_DST_ALPHA */
-
-/* BlendEquationSeparate */
-#define GL_FUNC_ADD                       0x8006
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_BLEND_EQUATION_RGB             0x8009    /* same as BLEND_EQUATION */
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-
-/* BlendSubtract */
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-
-/* Separate Blend Functions */
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-
-/* Buffer Objects */
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_DYNAMIC_DRAW                   0x88E8
-
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-
-/* CullFaceMode */
-#define GL_FRONT                          0x0404
-#define GL_BACK                           0x0405
-#define GL_FRONT_AND_BACK                 0x0408
-
-/* DepthFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* EnableCap */
-#define GL_TEXTURE_2D                     0x0DE1
-#define GL_CULL_FACE                      0x0B44
-#define GL_BLEND                          0x0BE2
-#define GL_DITHER                         0x0BD0
-#define GL_STENCIL_TEST                   0x0B90
-#define GL_DEPTH_TEST                     0x0B71
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_COVERAGE                0x80A0
-
-/* ErrorCode */
-#define GL_NO_ERROR                       0
-#define GL_INVALID_ENUM                   0x0500
-#define GL_INVALID_VALUE                  0x0501
-#define GL_INVALID_OPERATION              0x0502
-#define GL_OUT_OF_MEMORY                  0x0505
-
-/* FrontFaceDirection */
-#define GL_CW                             0x0900
-#define GL_CCW                            0x0901
-
-/* GetPName */
-#define GL_LINE_WIDTH                     0x0B21
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#define GL_CULL_FACE_MODE                 0x0B45
-#define GL_FRONT_FACE                     0x0B46
-#define GL_DEPTH_RANGE                    0x0B70
-#define GL_DEPTH_WRITEMASK                0x0B72
-#define GL_DEPTH_CLEAR_VALUE              0x0B73
-#define GL_DEPTH_FUNC                     0x0B74
-#define GL_STENCIL_CLEAR_VALUE            0x0B91
-#define GL_STENCIL_FUNC                   0x0B92
-#define GL_STENCIL_FAIL                   0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
-#define GL_STENCIL_REF                    0x0B97
-#define GL_STENCIL_VALUE_MASK             0x0B93
-#define GL_STENCIL_WRITEMASK              0x0B98
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#define GL_VIEWPORT                       0x0BA2
-#define GL_SCISSOR_BOX                    0x0C10
-/*      GL_SCISSOR_TEST */
-#define GL_COLOR_CLEAR_VALUE              0x0C22
-#define GL_COLOR_WRITEMASK                0x0C23
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_ALIGNMENT                 0x0D05
-#define GL_MAX_TEXTURE_SIZE               0x0D33
-#define GL_MAX_VIEWPORT_DIMS              0x0D3A
-#define GL_SUBPIXEL_BITS                  0x0D50
-#define GL_RED_BITS                       0x0D52
-#define GL_GREEN_BITS                     0x0D53
-#define GL_BLUE_BITS                      0x0D54
-#define GL_ALPHA_BITS                     0x0D55
-#define GL_DEPTH_BITS                     0x0D56
-#define GL_STENCIL_BITS                   0x0D57
-#define GL_POLYGON_OFFSET_UNITS           0x2A00
-/*      GL_POLYGON_OFFSET_FILL */
-#define GL_POLYGON_OFFSET_FACTOR          0x8038
-#define GL_TEXTURE_BINDING_2D             0x8069
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-
-/* GetTextureParameter */
-/*      GL_TEXTURE_MAG_FILTER */
-/*      GL_TEXTURE_MIN_FILTER */
-/*      GL_TEXTURE_WRAP_S */
-/*      GL_TEXTURE_WRAP_T */
-
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-
-/* HintMode */
-#define GL_DONT_CARE                      0x1100
-#define GL_FASTEST                        0x1101
-#define GL_NICEST                         0x1102
-
-/* HintTarget */
-#define GL_GENERATE_MIPMAP_HINT            0x8192
-
-/* DataType */
-#define GL_BYTE                           0x1400
-#define GL_UNSIGNED_BYTE                  0x1401
-#define GL_SHORT                          0x1402
-#define GL_UNSIGNED_SHORT                 0x1403
-#define GL_INT                            0x1404
-#define GL_UNSIGNED_INT                   0x1405
-#define GL_FLOAT                          0x1406
-#define GL_FIXED                          0x140C
-
-/* PixelFormat */
-#define GL_DEPTH_COMPONENT                0x1902
-#define GL_ALPHA                          0x1906
-#define GL_RGB                            0x1907
-#define GL_RGBA                           0x1908
-#define GL_LUMINANCE                      0x1909
-#define GL_LUMINANCE_ALPHA                0x190A
-
-/* PixelType */
-/*      GL_UNSIGNED_BYTE */
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-
-/* Shaders */
-#define GL_FRAGMENT_SHADER                  0x8B30
-#define GL_VERTEX_SHADER                    0x8B31
-#define GL_MAX_VERTEX_ATTRIBS               0x8869
-#define GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB
-#define GL_MAX_VARYING_VECTORS              0x8DFC
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS   0x8B4C
-#define GL_MAX_TEXTURE_IMAGE_UNITS          0x8872
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD
-#define GL_SHADER_TYPE                      0x8B4F
-#define GL_DELETE_STATUS                    0x8B80
-#define GL_LINK_STATUS                      0x8B82
-#define GL_VALIDATE_STATUS                  0x8B83
-#define GL_ATTACHED_SHADERS                 0x8B85
-#define GL_ACTIVE_UNIFORMS                  0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH        0x8B87
-#define GL_ACTIVE_ATTRIBUTES                0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH      0x8B8A
-#define GL_SHADING_LANGUAGE_VERSION         0x8B8C
-#define GL_CURRENT_PROGRAM                  0x8B8D
-
-/* StencilFunction */
-#define GL_NEVER                          0x0200
-#define GL_LESS                           0x0201
-#define GL_EQUAL                          0x0202
-#define GL_LEQUAL                         0x0203
-#define GL_GREATER                        0x0204
-#define GL_NOTEQUAL                       0x0205
-#define GL_GEQUAL                         0x0206
-#define GL_ALWAYS                         0x0207
-
-/* StencilOp */
-/*      GL_ZERO */
-#define GL_KEEP                           0x1E00
-#define GL_REPLACE                        0x1E01
-#define GL_INCR                           0x1E02
-#define GL_DECR                           0x1E03
-#define GL_INVERT                         0x150A
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-
-/* StringName */
-#define GL_VENDOR                         0x1F00
-#define GL_RENDERER                       0x1F01
-#define GL_VERSION                        0x1F02
-#define GL_EXTENSIONS                     0x1F03
-
-/* TextureMagFilter */
-#define GL_NEAREST                        0x2600
-#define GL_LINEAR                         0x2601
-
-/* TextureMinFilter */
-/*      GL_NEAREST */
-/*      GL_LINEAR */
-#define GL_NEAREST_MIPMAP_NEAREST         0x2700
-#define GL_LINEAR_MIPMAP_NEAREST          0x2701
-#define GL_NEAREST_MIPMAP_LINEAR          0x2702
-#define GL_LINEAR_MIPMAP_LINEAR           0x2703
-
-/* TextureParameterName */
-#define GL_TEXTURE_MAG_FILTER             0x2800
-#define GL_TEXTURE_MIN_FILTER             0x2801
-#define GL_TEXTURE_WRAP_S                 0x2802
-#define GL_TEXTURE_WRAP_T                 0x2803
-
-/* TextureTarget */
-/*      GL_TEXTURE_2D */
-#define GL_TEXTURE                        0x1702
-
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-
-/* TextureUnit */
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-
-/* TextureWrapMode */
-#define GL_REPEAT                         0x2901
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_MIRRORED_REPEAT                0x8370
-
-/* Uniform Types */
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_CUBE                   0x8B60
-
-/* Vertex Arrays */
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED        0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE           0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE         0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE           0x8625
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED     0x886A
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER        0x8645
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-
-/* Read Format */
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE   0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
-
-/* Shader Source */
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_SHADER_COMPILER                0x8DFA
-
-/* Shader Binary */
-#define GL_SHADER_BINARY_FORMATS          0x8DF8
-#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
-
-/* Shader Precision-Specified Types */
-#define GL_LOW_FLOAT                      0x8DF0
-#define GL_MEDIUM_FLOAT                   0x8DF1
-#define GL_HIGH_FLOAT                     0x8DF2
-#define GL_LOW_INT                        0x8DF3
-#define GL_MEDIUM_INT                     0x8DF4
-#define GL_HIGH_INT                       0x8DF5
-
-/* Framebuffer Object. */
-#define GL_FRAMEBUFFER                    0x8D40
-#define GL_RENDERBUFFER                   0x8D41
-
-#define GL_RGBA4                          0x8056
-#define GL_RGB5_A1                        0x8057
-#define GL_RGB565                         0x8D62
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_STENCIL_INDEX8                 0x8D48
-
-#define GL_RENDERBUFFER_WIDTH             0x8D42
-#define GL_RENDERBUFFER_HEIGHT            0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
-#define GL_RENDERBUFFER_RED_SIZE          0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
-
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE           0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME           0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL         0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-
-#define GL_COLOR_ATTACHMENT0              0x8CE0
-#define GL_DEPTH_ATTACHMENT               0x8D00
-#define GL_STENCIL_ATTACHMENT             0x8D20
-
-#define GL_NONE                           0
-
-#define GL_FRAMEBUFFER_COMPLETE                      0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT         0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS         0x8CD9
-#define GL_FRAMEBUFFER_UNSUPPORTED                   0x8CDD
-
-#define GL_FRAMEBUFFER_BINDING            0x8CA6
-#define GL_RENDERBUFFER_BINDING           0x8CA7
-#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
-
-#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
-
-/*-------------------------------------------------------------------------
- * GL core functions.
- *-----------------------------------------------------------------------*/
-
-GL_APICALL void         GL_APIENTRY glActiveTexture (GLenum texture);
-GL_APICALL void         GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
-GL_APICALL void         GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar* name);
-GL_APICALL void         GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
-GL_APICALL void         GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
-GL_APICALL void         GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
-GL_APICALL void         GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
-GL_APICALL void         GL_APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GL_APICALL void         GL_APIENTRY glBlendEquation ( GLenum mode );
-GL_APICALL void         GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
-GL_APICALL void         GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
-GL_APICALL void         GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-GL_APICALL void         GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage);
-GL_APICALL void         GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
-GL_APICALL GLenum       GL_APIENTRY glCheckFramebufferStatus (GLenum target);
-GL_APICALL void         GL_APIENTRY glClear (GLbitfield mask);
-GL_APICALL void         GL_APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GL_APICALL void         GL_APIENTRY glClearDepthf (GLclampf depth);
-GL_APICALL void         GL_APIENTRY glClearStencil (GLint s);
-GL_APICALL void         GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-GL_APICALL void         GL_APIENTRY glCompileShader (GLuint shader);
-GL_APICALL void         GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void         GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void         GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GL_APICALL void         GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL GLuint       GL_APIENTRY glCreateProgram (void);
-GL_APICALL GLuint       GL_APIENTRY glCreateShader (GLenum type);
-GL_APICALL void         GL_APIENTRY glCullFace (GLenum mode);
-GL_APICALL void         GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers);
-GL_APICALL void         GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers);
-GL_APICALL void         GL_APIENTRY glDeleteProgram (GLuint program);
-GL_APICALL void         GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers);
-GL_APICALL void         GL_APIENTRY glDeleteShader (GLuint shader);
-GL_APICALL void         GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures);
-GL_APICALL void         GL_APIENTRY glDepthFunc (GLenum func);
-GL_APICALL void         GL_APIENTRY glDepthMask (GLboolean flag);
-GL_APICALL void         GL_APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar);
-GL_APICALL void         GL_APIENTRY glDetachShader (GLuint program, GLuint shader);
-GL_APICALL void         GL_APIENTRY glDisable (GLenum cap);
-GL_APICALL void         GL_APIENTRY glDisableVertexAttribArray (GLuint index);
-GL_APICALL void         GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
-GL_APICALL void         GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices);
-GL_APICALL void         GL_APIENTRY glEnable (GLenum cap);
-GL_APICALL void         GL_APIENTRY glEnableVertexAttribArray (GLuint index);
-GL_APICALL void         GL_APIENTRY glFinish (void);
-GL_APICALL void         GL_APIENTRY glFlush (void);
-GL_APICALL void         GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GL_APICALL void         GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GL_APICALL void         GL_APIENTRY glFrontFace (GLenum mode);
-GL_APICALL void         GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers);
-GL_APICALL void         GL_APIENTRY glGenerateMipmap (GLenum target);
-GL_APICALL void         GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers);
-GL_APICALL void         GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers);
-GL_APICALL void         GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
-GL_APICALL void         GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
-GL_APICALL void         GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
-GL_APICALL void         GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-GL_APICALL int          GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
-GL_APICALL void         GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
-GL_APICALL void         GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL GLenum       GL_APIENTRY glGetError (void);
-GL_APICALL void         GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog);
-GL_APICALL void         GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog);
-GL_APICALL void         GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
-GL_APICALL void         GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source);
-GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name);
-GL_APICALL void         GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
-GL_APICALL int          GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
-GL_APICALL void         GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
-GL_APICALL void         GL_APIENTRY glHint (GLenum target, GLenum mode);
-GL_APICALL GLboolean    GL_APIENTRY glIsBuffer (GLuint buffer);
-GL_APICALL GLboolean    GL_APIENTRY glIsEnabled (GLenum cap);
-GL_APICALL GLboolean    GL_APIENTRY glIsFramebuffer (GLuint framebuffer);
-GL_APICALL GLboolean    GL_APIENTRY glIsProgram (GLuint program);
-GL_APICALL GLboolean    GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer);
-GL_APICALL GLboolean    GL_APIENTRY glIsShader (GLuint shader);
-GL_APICALL GLboolean    GL_APIENTRY glIsTexture (GLuint texture);
-GL_APICALL void         GL_APIENTRY glLineWidth (GLfloat width);
-GL_APICALL void         GL_APIENTRY glLinkProgram (GLuint program);
-GL_APICALL void         GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
-GL_APICALL void         GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
-GL_APICALL void         GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels);
-GL_APICALL void         GL_APIENTRY glReleaseShaderCompiler (void);
-GL_APICALL void         GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void         GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
-GL_APICALL void         GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void         GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
-GL_APICALL void         GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
-GL_APICALL void         GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
-GL_APICALL void         GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
-GL_APICALL void         GL_APIENTRY glStencilMask (GLuint mask);
-GL_APICALL void         GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
-GL_APICALL void         GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
-GL_APICALL void         GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
-GL_APICALL void         GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void         GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
-GL_APICALL void         GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params);
-GL_APICALL void         GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
-GL_APICALL void         GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint* params);
-GL_APICALL void         GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void         GL_APIENTRY glUniform1f (GLint location, GLfloat x);
-GL_APICALL void         GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void         GL_APIENTRY glUniform1i (GLint location, GLint x);
-GL_APICALL void         GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void         GL_APIENTRY glUniform2f (GLint location, GLfloat x, GLfloat y);
-GL_APICALL void         GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void         GL_APIENTRY glUniform2i (GLint location, GLint x, GLint y);
-GL_APICALL void         GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void         GL_APIENTRY glUniform3f (GLint location, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void         GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void         GL_APIENTRY glUniform3i (GLint location, GLint x, GLint y, GLint z);
-GL_APICALL void         GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void         GL_APIENTRY glUniform4f (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GL_APICALL void         GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void         GL_APIENTRY glUniform4i (GLint location, GLint x, GLint y, GLint z, GLint w);
-GL_APICALL void         GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void         GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void         GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void         GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void         GL_APIENTRY glUseProgram (GLuint program);
-GL_APICALL void         GL_APIENTRY glValidateProgram (GLuint program);
-GL_APICALL void         GL_APIENTRY glVertexAttrib1f (GLuint indx, GLfloat x);
-GL_APICALL void         GL_APIENTRY glVertexAttrib1fv (GLuint indx, const GLfloat* values);
-GL_APICALL void         GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y);
-GL_APICALL void         GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values);
-GL_APICALL void         GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void         GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values);
-GL_APICALL void         GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GL_APICALL void         GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values);
-GL_APICALL void         GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr);
-GL_APICALL void         GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gl2_h_ */
-
-
-#ifndef __gl2ext_h_
-#define __gl2ext_h_
-
-/* $Revision: 19436 $ on $Date:: 2012-10-10 10:37:04 -0700 #$ */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-#ifndef GL_APIENTRYP
-#   define GL_APIENTRYP GL_APIENTRY*
-#endif
-
-/*------------------------------------------------------------------------*
- * OES extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_OES_compressed_ETC1_RGB8_texture */
-#ifndef GL_OES_compressed_ETC1_RGB8_texture
-#define GL_ETC1_RGB8_OES                                        0x8D64
-#endif
-
-/* GL_OES_compressed_paletted_texture */
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_PALETTE4_RGB8_OES                                    0x8B90
-#define GL_PALETTE4_RGBA8_OES                                   0x8B91
-#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92
-#define GL_PALETTE4_RGBA4_OES                                   0x8B93
-#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94
-#define GL_PALETTE8_RGB8_OES                                    0x8B95
-#define GL_PALETTE8_RGBA8_OES                                   0x8B96
-#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97
-#define GL_PALETTE8_RGBA4_OES                                   0x8B98
-#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
-#endif
-
-/* GL_OES_depth24 */
-#ifndef GL_OES_depth24
-#define GL_DEPTH_COMPONENT24_OES                                0x81A6
-#endif
-
-/* GL_OES_depth32 */
-#ifndef GL_OES_depth32
-#define GL_DEPTH_COMPONENT32_OES                                0x81A7
-#endif
-
-/* GL_OES_depth_texture */
-/* No new tokens introduced by this extension. */
-
-/* GL_OES_EGL_image */
-#ifndef GL_OES_EGL_image
-typedef void* GLeglImageOES;
-#endif
-
-/* GL_OES_EGL_image_external */
-#ifndef GL_OES_EGL_image_external
-/* GLeglImageOES defined in GL_OES_EGL_image already. */
-#define GL_TEXTURE_EXTERNAL_OES                                 0x8D65
-#define GL_SAMPLER_EXTERNAL_OES                                 0x8D66
-#define GL_TEXTURE_BINDING_EXTERNAL_OES                         0x8D67
-#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES                     0x8D68
-#endif
-
-/* GL_OES_element_index_uint */
-#ifndef GL_OES_element_index_uint
-#define GL_UNSIGNED_INT                                         0x1405
-#endif
-
-/* GL_OES_get_program_binary */
-#ifndef GL_OES_get_program_binary
-#define GL_PROGRAM_BINARY_LENGTH_OES                            0x8741
-#define GL_NUM_PROGRAM_BINARY_FORMATS_OES                       0x87FE
-#define GL_PROGRAM_BINARY_FORMATS_OES                           0x87FF
-#endif
-
-/* GL_OES_mapbuffer */
-#ifndef GL_OES_mapbuffer
-#define GL_WRITE_ONLY_OES                                       0x88B9
-#define GL_BUFFER_ACCESS_OES                                    0x88BB
-#define GL_BUFFER_MAPPED_OES                                    0x88BC
-#define GL_BUFFER_MAP_POINTER_OES                               0x88BD
-#endif
-
-/* GL_OES_packed_depth_stencil */
-#ifndef GL_OES_packed_depth_stencil
-#define GL_DEPTH_STENCIL_OES                                    0x84F9
-#define GL_UNSIGNED_INT_24_8_OES                                0x84FA
-#define GL_DEPTH24_STENCIL8_OES                                 0x88F0
-#endif
-
-/* GL_OES_required_internalformat */
-#ifndef GL_OES_required_internalformat 
-#define GL_ALPHA8_OES                                           0x803C
-#define GL_DEPTH_COMPONENT16_OES                                0x81A5
-/* reuse GL_DEPTH_COMPONENT24_OES */                            
-/* reuse GL_DEPTH24_STENCIL8_OES */                             
-/* reuse GL_DEPTH_COMPONENT32_OES */                            
-#define GL_LUMINANCE4_ALPHA4_OES                                0x8043
-#define GL_LUMINANCE8_ALPHA8_OES                                0x8045
-#define GL_LUMINANCE8_OES                                       0x8040
-#define GL_RGBA4_OES                                            0x8056
-#define GL_RGB5_A1_OES                                          0x8057
-#define GL_RGB565_OES                                           0x8D62
-/* reuse GL_RGB8_OES */                              
-/* reuse GL_RGBA8_OES */  
-/* reuse GL_RGB10_EXT */
-/* reuse GL_RGB10_A2_EXT */
-#endif 
-
-/* GL_OES_rgb8_rgba8 */
-#ifndef GL_OES_rgb8_rgba8
-#define GL_RGB8_OES                                             0x8051
-#define GL_RGBA8_OES                                            0x8058
-#endif
-
-/* GL_OES_standard_derivatives */
-#ifndef GL_OES_standard_derivatives
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES                  0x8B8B
-#endif
-
-/* GL_OES_stencil1 */
-#ifndef GL_OES_stencil1
-#define GL_STENCIL_INDEX1_OES                                   0x8D46
-#endif
-
-/* GL_OES_stencil4 */
-#ifndef GL_OES_stencil4
-#define GL_STENCIL_INDEX4_OES                                   0x8D47
-#endif
-
-#ifndef GL_OES_surfaceless_context
-#define GL_FRAMEBUFFER_UNDEFINED_OES                            0x8219
-#endif
-
-/* GL_OES_texture_3D */
-#ifndef GL_OES_texture_3D
-#define GL_TEXTURE_WRAP_R_OES                                   0x8072
-#define GL_TEXTURE_3D_OES                                       0x806F
-#define GL_TEXTURE_BINDING_3D_OES                               0x806A
-#define GL_MAX_3D_TEXTURE_SIZE_OES                              0x8073
-#define GL_SAMPLER_3D_OES                                       0x8B5F
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES        0x8CD4
-#endif
-
-/* GL_OES_texture_float */
-/* No new tokens introduced by this extension. */
-
-/* GL_OES_texture_float_linear */
-/* No new tokens introduced by this extension. */
-
-/* GL_OES_texture_half_float */
-#ifndef GL_OES_texture_half_float
-#define GL_HALF_FLOAT_OES                                       0x8D61
-#endif
-
-/* GL_OES_texture_half_float_linear */
-/* No new tokens introduced by this extension. */
-
-/* GL_OES_texture_npot */
-/* No new tokens introduced by this extension. */
-
-/* GL_OES_vertex_array_object */
-#ifndef GL_OES_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_OES                             0x85B5
-#endif
-
-/* GL_OES_vertex_half_float */
-/* GL_HALF_FLOAT_OES defined in GL_OES_texture_half_float already. */
-
-/* GL_OES_vertex_type_10_10_10_2 */
-#ifndef GL_OES_vertex_type_10_10_10_2
-#define GL_UNSIGNED_INT_10_10_10_2_OES                          0x8DF6
-#define GL_INT_10_10_10_2_OES                                   0x8DF7
-#endif
-
-/*------------------------------------------------------------------------*
- * KHR extension tokens
- *------------------------------------------------------------------------*/
-
-#ifndef GL_KHR_debug
-typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
-#define GL_DEBUG_OUTPUT_SYNCHRONOUS                             0x8242
-#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH                     0x8243
-#define GL_DEBUG_CALLBACK_FUNCTION                              0x8244
-#define GL_DEBUG_CALLBACK_USER_PARAM                            0x8245
-#define GL_DEBUG_SOURCE_API                                     0x8246
-#define GL_DEBUG_SOURCE_WINDOW_SYSTEM                           0x8247
-#define GL_DEBUG_SOURCE_SHADER_COMPILER                         0x8248
-#define GL_DEBUG_SOURCE_THIRD_PARTY                             0x8249
-#define GL_DEBUG_SOURCE_APPLICATION                             0x824A
-#define GL_DEBUG_SOURCE_OTHER                                   0x824B
-#define GL_DEBUG_TYPE_ERROR                                     0x824C
-#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR                       0x824D
-#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR                        0x824E
-#define GL_DEBUG_TYPE_PORTABILITY                               0x824F
-#define GL_DEBUG_TYPE_PERFORMANCE                               0x8250
-#define GL_DEBUG_TYPE_OTHER                                     0x8251
-#define GL_DEBUG_TYPE_MARKER                                    0x8268
-#define GL_DEBUG_TYPE_PUSH_GROUP                                0x8269
-#define GL_DEBUG_TYPE_POP_GROUP                                 0x826A
-#define GL_DEBUG_SEVERITY_NOTIFICATION                          0x826B
-#define GL_MAX_DEBUG_GROUP_STACK_DEPTH                          0x826C
-#define GL_DEBUG_GROUP_STACK_DEPTH                              0x826D
-#define GL_BUFFER                                               0x82E0
-#define GL_SHADER                                               0x82E1
-#define GL_PROGRAM                                              0x82E2
-#define GL_QUERY                                                0x82E3
-/* PROGRAM_PIPELINE only in GL */                               
-#define GL_SAMPLER                                              0x82E6
-/* DISPLAY_LIST only in GL */                                   
-#define GL_MAX_LABEL_LENGTH                                     0x82E8
-#define GL_MAX_DEBUG_MESSAGE_LENGTH                             0x9143
-#define GL_MAX_DEBUG_LOGGED_MESSAGES                            0x9144
-#define GL_DEBUG_LOGGED_MESSAGES                                0x9145
-#define GL_DEBUG_SEVERITY_HIGH                                  0x9146
-#define GL_DEBUG_SEVERITY_MEDIUM                                0x9147
-#define GL_DEBUG_SEVERITY_LOW                                   0x9148
-#define GL_DEBUG_OUTPUT                                         0x92E0
-#define GL_CONTEXT_FLAG_DEBUG_BIT                               0x00000002
-#define GL_STACK_OVERFLOW                                       0x0503
-#define GL_STACK_UNDERFLOW                                      0x0504
-#endif
-
-#ifndef GL_KHR_texture_compression_astc_ldr
-#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR                         0x93B0
-#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR                         0x93B1
-#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR                         0x93B2
-#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR                         0x93B3
-#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR                         0x93B4
-#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR                         0x93B5
-#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR                         0x93B6
-#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR                         0x93B7
-#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR                        0x93B8
-#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR                        0x93B9
-#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR                        0x93BA
-#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR                       0x93BB
-#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR                       0x93BC
-#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR                       0x93BD
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR                 0x93D0
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR                 0x93D1
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR                 0x93D2
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR                 0x93D3
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR                 0x93D4
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR                 0x93D5
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR                 0x93D6
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR                 0x93D7
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR                0x93D8
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR                0x93D9
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR                0x93DA
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR               0x93DB
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR               0x93DC
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR               0x93DD
-#endif
-
-/*------------------------------------------------------------------------*
- * AMD extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_AMD_compressed_3DC_texture */
-#ifndef GL_AMD_compressed_3DC_texture
-#define GL_3DC_X_AMD                                            0x87F9
-#define GL_3DC_XY_AMD                                           0x87FA
-#endif
-
-/* GL_AMD_compressed_ATC_texture */
-#ifndef GL_AMD_compressed_ATC_texture
-#define GL_ATC_RGB_AMD                                          0x8C92
-#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD                          0x8C93
-#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD                      0x87EE
-#endif
-
-/* GL_AMD_performance_monitor */
-#ifndef GL_AMD_performance_monitor
-#define GL_COUNTER_TYPE_AMD                                     0x8BC0
-#define GL_COUNTER_RANGE_AMD                                    0x8BC1
-#define GL_UNSIGNED_INT64_AMD                                   0x8BC2
-#define GL_PERCENTAGE_AMD                                       0x8BC3
-#define GL_PERFMON_RESULT_AVAILABLE_AMD                         0x8BC4
-#define GL_PERFMON_RESULT_SIZE_AMD                              0x8BC5
-#define GL_PERFMON_RESULT_AMD                                   0x8BC6
-#endif
-
-/* GL_AMD_program_binary_Z400 */
-#ifndef GL_AMD_program_binary_Z400
-#define GL_Z400_BINARY_AMD                                      0x8740
-#endif
-
-/*------------------------------------------------------------------------*
- * ANGLE extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_ANGLE_framebuffer_blit */
-#ifndef GL_ANGLE_framebuffer_blit
-#define GL_READ_FRAMEBUFFER_ANGLE                               0x8CA8
-#define GL_DRAW_FRAMEBUFFER_ANGLE                               0x8CA9
-#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE                       0x8CA6
-#define GL_READ_FRAMEBUFFER_BINDING_ANGLE                       0x8CAA
-#endif
-
-/* GL_ANGLE_framebuffer_multisample */
-#ifndef GL_ANGLE_framebuffer_multisample
-#define GL_RENDERBUFFER_SAMPLES_ANGLE                           0x8CAB
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE             0x8D56
-#define GL_MAX_SAMPLES_ANGLE                                    0x8D57
-#endif
-
-/* GL_ANGLE_instanced_arrays */
-#ifndef GL_ANGLE_instanced_arrays 
-#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE                    0x88FE
-#endif
-
-/* GL_ANGLE_pack_reverse_row_order */
-#ifndef GL_ANGLE_pack_reverse_row_order 
-#define GL_PACK_REVERSE_ROW_ORDER_ANGLE                         0x93A4
-#endif
-
-/* GL_ANGLE_texture_compression_dxt3 */
-#ifndef GL_ANGLE_texture_compression_dxt3 
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE                      0x83F2
-#endif
-
-/* GL_ANGLE_texture_compression_dxt5 */
-#ifndef GL_ANGLE_texture_compression_dxt5 
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE                      0x83F3
-#endif
-
-/* GL_ANGLE_texture_usage */
-#ifndef GL_ANGLE_texture_usage 
-#define GL_TEXTURE_USAGE_ANGLE                                  0x93A2
-#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE                         0x93A3
-#endif
-
-/* GL_ANGLE_translated_shader_source */
-#ifndef GL_ANGLE_translated_shader_source 
-#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE                0x93A0
-#endif
-
-/*------------------------------------------------------------------------*
- * APPLE extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_APPLE_copy_texture_levels */
-/* No new tokens introduced by this extension. */
-    
-/* GL_APPLE_framebuffer_multisample */
-#ifndef GL_APPLE_framebuffer_multisample
-#define GL_RENDERBUFFER_SAMPLES_APPLE                           0x8CAB
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE             0x8D56
-#define GL_MAX_SAMPLES_APPLE                                    0x8D57
-#define GL_READ_FRAMEBUFFER_APPLE                               0x8CA8
-#define GL_DRAW_FRAMEBUFFER_APPLE                               0x8CA9
-#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE                       0x8CA6
-#define GL_READ_FRAMEBUFFER_BINDING_APPLE                       0x8CAA
-#endif
-
-/* GL_APPLE_rgb_422 */
-#ifndef GL_APPLE_rgb_422
-#define GL_RGB_422_APPLE                                        0x8A1F
-#define GL_UNSIGNED_SHORT_8_8_APPLE                             0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE                         0x85BB
-#endif
-
-/* GL_APPLE_sync */
-#ifndef GL_APPLE_sync
-
-#ifndef __gl3_h_
-/* These types are defined with reference to <inttypes.h>
- * in the Apple extension spec, but here we use the Khronos
- * portable types in khrplatform.h, and assume those types 
- * are always defined.
- * If any other extensions using these types are defined, 
- * the typedefs must move out of this block and be shared.
- */
-typedef khronos_int64_t GLint64;
-typedef khronos_uint64_t GLuint64;
-typedef struct __GLsync *GLsync;
-#endif
-
-#define GL_SYNC_OBJECT_APPLE                                    0x8A53
-#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE                        0x9111
-#define GL_OBJECT_TYPE_APPLE                                    0x9112
-#define GL_SYNC_CONDITION_APPLE                                 0x9113
-#define GL_SYNC_STATUS_APPLE                                    0x9114
-#define GL_SYNC_FLAGS_APPLE                                     0x9115
-#define GL_SYNC_FENCE_APPLE                                     0x9116
-#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE                     0x9117
-#define GL_UNSIGNALED_APPLE                                     0x9118
-#define GL_SIGNALED_APPLE                                       0x9119
-#define GL_ALREADY_SIGNALED_APPLE                               0x911A
-#define GL_TIMEOUT_EXPIRED_APPLE                                0x911B
-#define GL_CONDITION_SATISFIED_APPLE                            0x911C
-#define GL_WAIT_FAILED_APPLE                                    0x911D
-#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE                        0x00000001
-#define GL_TIMEOUT_IGNORED_APPLE                                0xFFFFFFFFFFFFFFFFull
-#endif
-
-/* GL_APPLE_texture_format_BGRA8888 */
-#ifndef GL_APPLE_texture_format_BGRA8888
-#define GL_BGRA_EXT                                             0x80E1
-#endif
-
-/* GL_APPLE_texture_max_level */
-#ifndef GL_APPLE_texture_max_level
-#define GL_TEXTURE_MAX_LEVEL_APPLE                              0x813D
-#endif
-
-/*------------------------------------------------------------------------*
- * ARM extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_ARM_mali_program_binary */
-#ifndef GL_ARM_mali_program_binary
-#define GL_MALI_PROGRAM_BINARY_ARM                              0x8F61
-#endif
-
-/* GL_ARM_mali_shader_binary */
-#ifndef GL_ARM_mali_shader_binary
-#define GL_MALI_SHADER_BINARY_ARM                               0x8F60
-#endif
-
-/* GL_ARM_rgba8 */
-/* No new tokens introduced by this extension. */
-
-/*------------------------------------------------------------------------*
- * EXT extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_EXT_blend_minmax */
-#ifndef GL_EXT_blend_minmax
-#define GL_MIN_EXT                                              0x8007
-#define GL_MAX_EXT                                              0x8008
-#endif
-
-/* GL_EXT_color_buffer_half_float */
-#ifndef GL_EXT_color_buffer_half_float
-#define GL_RGBA16F_EXT                                          0x881A
-#define GL_RGB16F_EXT                                           0x881B
-#define GL_RG16F_EXT                                            0x822F
-#define GL_R16F_EXT                                             0x822D
-#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT            0x8211
-#define GL_UNSIGNED_NORMALIZED_EXT                              0x8C17
-#endif
-
-/* GL_EXT_debug_label */
-#ifndef GL_EXT_debug_label
-#define GL_PROGRAM_PIPELINE_OBJECT_EXT                          0x8A4F
-#define GL_PROGRAM_OBJECT_EXT                                   0x8B40
-#define GL_SHADER_OBJECT_EXT                                    0x8B48
-#define GL_BUFFER_OBJECT_EXT                                    0x9151
-#define GL_QUERY_OBJECT_EXT                                     0x9153
-#define GL_VERTEX_ARRAY_OBJECT_EXT                              0x9154
-#endif
-
-/* GL_EXT_debug_marker */
-/* No new tokens introduced by this extension. */
-
-/* GL_EXT_discard_framebuffer */
-#ifndef GL_EXT_discard_framebuffer
-#define GL_COLOR_EXT                                            0x1800
-#define GL_DEPTH_EXT                                            0x1801
-#define GL_STENCIL_EXT                                          0x1802
-#endif
-
-/* GL_EXT_map_buffer_range */
-#ifndef GL_EXT_map_buffer_range
-#define GL_MAP_READ_BIT_EXT                                     0x0001
-#define GL_MAP_WRITE_BIT_EXT                                    0x0002
-#define GL_MAP_INVALIDATE_RANGE_BIT_EXT                         0x0004
-#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT                        0x0008
-#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT                           0x0010
-#define GL_MAP_UNSYNCHRONIZED_BIT_EXT                           0x0020
-#endif
-
-/* GL_EXT_multisampled_render_to_texture */
-#ifndef GL_EXT_multisampled_render_to_texture
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT           0x8D6C
-/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ 
-#define GL_RENDERBUFFER_SAMPLES_EXT                             0x8CAB
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT               0x8D56
-#define GL_MAX_SAMPLES_EXT                                      0x8D57
-#endif
-
-/* GL_EXT_multiview_draw_buffers */
-#ifndef GL_EXT_multiview_draw_buffers
-#define GL_COLOR_ATTACHMENT_EXT                                 0x90F0
-#define GL_MULTIVIEW_EXT                                        0x90F1
-#define GL_DRAW_BUFFER_EXT                                      0x0C01
-#define GL_READ_BUFFER_EXT                                      0x0C02
-#define GL_MAX_MULTIVIEW_BUFFERS_EXT                            0x90F2
-#endif
-
-/* GL_EXT_multi_draw_arrays */
-/* No new tokens introduced by this extension. */
-
-/* GL_EXT_occlusion_query_boolean */
-#ifndef GL_EXT_occlusion_query_boolean
-#define GL_ANY_SAMPLES_PASSED_EXT                               0x8C2F
-#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT                  0x8D6A
-#define GL_CURRENT_QUERY_EXT                                    0x8865
-#define GL_QUERY_RESULT_EXT                                     0x8866
-#define GL_QUERY_RESULT_AVAILABLE_EXT                           0x8867
-#endif
-
-/* GL_EXT_read_format_bgra */
-#ifndef GL_EXT_read_format_bgra
-#define GL_BGRA_EXT                                             0x80E1
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT                       0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT                       0x8366
-#endif
-
-/* GL_EXT_robustness */
-#ifndef GL_EXT_robustness
-/* reuse GL_NO_ERROR */
-#define GL_GUILTY_CONTEXT_RESET_EXT                             0x8253
-#define GL_INNOCENT_CONTEXT_RESET_EXT                           0x8254
-#define GL_UNKNOWN_CONTEXT_RESET_EXT                            0x8255
-#define GL_CONTEXT_ROBUST_ACCESS_EXT                            0x90F3
-#define GL_RESET_NOTIFICATION_STRATEGY_EXT                      0x8256
-#define GL_LOSE_CONTEXT_ON_RESET_EXT                            0x8252
-#define GL_NO_RESET_NOTIFICATION_EXT                            0x8261
-#endif
-
-/* GL_EXT_separate_shader_objects */
-#ifndef GL_EXT_separate_shader_objects
-#define GL_VERTEX_SHADER_BIT_EXT                                0x00000001
-#define GL_FRAGMENT_SHADER_BIT_EXT                              0x00000002
-#define GL_ALL_SHADER_BITS_EXT                                  0xFFFFFFFF
-#define GL_PROGRAM_SEPARABLE_EXT                                0x8258
-#define GL_ACTIVE_PROGRAM_EXT                                   0x8259
-#define GL_PROGRAM_PIPELINE_BINDING_EXT                         0x825A
-#endif
-
-/* GL_EXT_shader_framebuffer_fetch */
-#ifndef GL_EXT_shader_framebuffer_fetch
-#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT                 0x8A52
-#endif
-
-/* GL_EXT_shader_texture_lod */
-/* No new tokens introduced by this extension. */
-
-/* GL_EXT_shadow_samplers */
-#ifndef GL_EXT_shadow_samplers
-#define GL_TEXTURE_COMPARE_MODE_EXT                             0x884C
-#define GL_TEXTURE_COMPARE_FUNC_EXT                             0x884D
-#define GL_COMPARE_REF_TO_TEXTURE_EXT                           0x884E
-#define GL_SAMPLER_2D_SHADOW_EXT                                0x8B62
-#endif
-
-/* GL_EXT_sRGB */
-#ifndef GL_EXT_sRGB
-#define GL_SRGB_EXT                                             0x8C40
-#define GL_SRGB_ALPHA_EXT                                       0x8C42
-#define GL_SRGB8_ALPHA8_EXT                                     0x8C43
-#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT            0x8210
-#endif
-
-/* GL_EXT_texture_compression_dxt1 */
-#ifndef GL_EXT_texture_compression_dxt1
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT                         0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT                        0x83F1
-#endif
-
-/* GL_EXT_texture_filter_anisotropic */
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT                           0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT                       0x84FF
-#endif
-
-/* GL_EXT_texture_format_BGRA8888 */
-#ifndef GL_EXT_texture_format_BGRA8888
-#define GL_BGRA_EXT                                             0x80E1
-#endif
-
-/* GL_EXT_texture_rg */
-#ifndef GL_EXT_texture_rg
-#define GL_RED_EXT                                              0x1903
-#define GL_RG_EXT                                               0x8227
-#define GL_R8_EXT                                               0x8229
-#define GL_RG8_EXT                                              0x822B
-#endif
-
-/* GL_EXT_texture_storage */
-#ifndef GL_EXT_texture_storage
-#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT                         0x912F
-#define GL_ALPHA8_EXT                                           0x803C  
-#define GL_LUMINANCE8_EXT                                       0x8040
-#define GL_LUMINANCE8_ALPHA8_EXT                                0x8045
-#define GL_RGBA32F_EXT                                          0x8814  
-#define GL_RGB32F_EXT                                           0x8815
-#define GL_ALPHA32F_EXT                                         0x8816
-#define GL_LUMINANCE32F_EXT                                     0x8818
-#define GL_LUMINANCE_ALPHA32F_EXT                               0x8819
-/* reuse GL_RGBA16F_EXT */
-/* reuse GL_RGB16F_EXT */
-#define GL_ALPHA16F_EXT                                         0x881C
-#define GL_LUMINANCE16F_EXT                                     0x881E
-#define GL_LUMINANCE_ALPHA16F_EXT                               0x881F
-#define GL_RGB10_A2_EXT                                         0x8059  
-#define GL_RGB10_EXT                                            0x8052
-#define GL_BGRA8_EXT                                            0x93A1
-#define GL_R8_EXT                                               0x8229
-#define GL_RG8_EXT                                              0x822B
-#define GL_R32F_EXT                                             0x822E  
-#define GL_RG32F_EXT                                            0x8230
-#define GL_R16F_EXT                                             0x822D
-#define GL_RG16F_EXT                                            0x822F
-#endif
-
-/* GL_EXT_texture_type_2_10_10_10_REV */
-#ifndef GL_EXT_texture_type_2_10_10_10_REV
-#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT                      0x8368
-#endif
-
-/* GL_EXT_unpack_subimage */
-#ifndef GL_EXT_unpack_subimage
-#define GL_UNPACK_ROW_LENGTH                                    0x0CF2
-#define GL_UNPACK_SKIP_ROWS                                     0x0CF3
-#define GL_UNPACK_SKIP_PIXELS                                   0x0CF4
-#endif
-
-/*------------------------------------------------------------------------*
- * DMP extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_DMP_shader_binary */
-#ifndef GL_DMP_shader_binary
-#define GL_SHADER_BINARY_DMP                                    0x9250
-#endif
-
-/*------------------------------------------------------------------------*
- * FJ extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_FJ_shader_binary_GCCSO */
-#ifndef GL_FJ_shader_binary_GCCSO
-#define GCCSO_SHADER_BINARY_FJ                                  0x9260
-#endif
-
-/*------------------------------------------------------------------------*
- * IMG extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_IMG_program_binary */
-#ifndef GL_IMG_program_binary
-#define GL_SGX_PROGRAM_BINARY_IMG                               0x9130
-#endif
-
-/* GL_IMG_read_format */
-#ifndef GL_IMG_read_format
-#define GL_BGRA_IMG                                             0x80E1
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG                       0x8365
-#endif
-
-/* GL_IMG_shader_binary */
-#ifndef GL_IMG_shader_binary
-#define GL_SGX_BINARY_IMG                                       0x8C0A
-#endif
-
-/* GL_IMG_texture_compression_pvrtc */
-#ifndef GL_IMG_texture_compression_pvrtc
-#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG                      0x8C00
-#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG                      0x8C01
-#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG                     0x8C02
-#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG                     0x8C03
-#endif
-
-/* GL_IMG_multisampled_render_to_texture */
-#ifndef GL_IMG_multisampled_render_to_texture
-#define GL_RENDERBUFFER_SAMPLES_IMG                             0x9133
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG               0x9134
-#define GL_MAX_SAMPLES_IMG                                      0x9135
-#define GL_TEXTURE_SAMPLES_IMG                                  0x9136
-#endif
-
-/*------------------------------------------------------------------------*
- * NV extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_NV_coverage_sample */
-#ifndef GL_NV_coverage_sample
-#define GL_COVERAGE_COMPONENT_NV                                0x8ED0
-#define GL_COVERAGE_COMPONENT4_NV                               0x8ED1
-#define GL_COVERAGE_ATTACHMENT_NV                               0x8ED2
-#define GL_COVERAGE_BUFFERS_NV                                  0x8ED3
-#define GL_COVERAGE_SAMPLES_NV                                  0x8ED4
-#define GL_COVERAGE_ALL_FRAGMENTS_NV                            0x8ED5
-#define GL_COVERAGE_EDGE_FRAGMENTS_NV                           0x8ED6
-#define GL_COVERAGE_AUTOMATIC_NV                                0x8ED7
-#define GL_COVERAGE_BUFFER_BIT_NV                               0x8000
-#endif
-
-/* GL_NV_depth_nonlinear */
-#ifndef GL_NV_depth_nonlinear
-#define GL_DEPTH_COMPONENT16_NONLINEAR_NV                       0x8E2C
-#endif
-
-/* GL_NV_draw_buffers */
-#ifndef GL_NV_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_NV                                  0x8824
-#define GL_DRAW_BUFFER0_NV                                      0x8825
-#define GL_DRAW_BUFFER1_NV                                      0x8826
-#define GL_DRAW_BUFFER2_NV                                      0x8827
-#define GL_DRAW_BUFFER3_NV                                      0x8828
-#define GL_DRAW_BUFFER4_NV                                      0x8829
-#define GL_DRAW_BUFFER5_NV                                      0x882A
-#define GL_DRAW_BUFFER6_NV                                      0x882B
-#define GL_DRAW_BUFFER7_NV                                      0x882C
-#define GL_DRAW_BUFFER8_NV                                      0x882D
-#define GL_DRAW_BUFFER9_NV                                      0x882E
-#define GL_DRAW_BUFFER10_NV                                     0x882F
-#define GL_DRAW_BUFFER11_NV                                     0x8830
-#define GL_DRAW_BUFFER12_NV                                     0x8831
-#define GL_DRAW_BUFFER13_NV                                     0x8832
-#define GL_DRAW_BUFFER14_NV                                     0x8833
-#define GL_DRAW_BUFFER15_NV                                     0x8834
-#define GL_COLOR_ATTACHMENT0_NV                                 0x8CE0
-#define GL_COLOR_ATTACHMENT1_NV                                 0x8CE1
-#define GL_COLOR_ATTACHMENT2_NV                                 0x8CE2
-#define GL_COLOR_ATTACHMENT3_NV                                 0x8CE3
-#define GL_COLOR_ATTACHMENT4_NV                                 0x8CE4
-#define GL_COLOR_ATTACHMENT5_NV                                 0x8CE5
-#define GL_COLOR_ATTACHMENT6_NV                                 0x8CE6
-#define GL_COLOR_ATTACHMENT7_NV                                 0x8CE7
-#define GL_COLOR_ATTACHMENT8_NV                                 0x8CE8
-#define GL_COLOR_ATTACHMENT9_NV                                 0x8CE9
-#define GL_COLOR_ATTACHMENT10_NV                                0x8CEA
-#define GL_COLOR_ATTACHMENT11_NV                                0x8CEB
-#define GL_COLOR_ATTACHMENT12_NV                                0x8CEC
-#define GL_COLOR_ATTACHMENT13_NV                                0x8CED
-#define GL_COLOR_ATTACHMENT14_NV                                0x8CEE
-#define GL_COLOR_ATTACHMENT15_NV                                0x8CEF
-#endif
-
-/* GL_NV_fbo_color_attachments */
-#ifndef GL_NV_fbo_color_attachments
-#define GL_MAX_COLOR_ATTACHMENTS_NV                             0x8CDF
-/* GL_COLOR_ATTACHMENT{0-15}_NV defined in GL_NV_draw_buffers already. */
-#endif
-
-/* GL_NV_fence */
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV                                     0x84F2
-#define GL_FENCE_STATUS_NV                                      0x84F3
-#define GL_FENCE_CONDITION_NV                                   0x84F4
-#endif
-
-/* GL_NV_read_buffer */
-#ifndef GL_NV_read_buffer
-#define GL_READ_BUFFER_NV                                       0x0C02
-#endif
-
-/* GL_NV_read_buffer_front */
-/* No new tokens introduced by this extension. */
-
-/* GL_NV_read_depth */
-/* No new tokens introduced by this extension. */
-
-/* GL_NV_read_depth_stencil */
-/* No new tokens introduced by this extension. */
-
-/* GL_NV_read_stencil */
-/* No new tokens introduced by this extension. */
-
-/* GL_NV_texture_compression_s3tc_update */
-/* No new tokens introduced by this extension. */
-
-/* GL_NV_texture_npot_2D_mipmap */
-/* No new tokens introduced by this extension. */
-
-/*------------------------------------------------------------------------*
- * QCOM extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_QCOM_alpha_test */
-#ifndef GL_QCOM_alpha_test
-#define GL_ALPHA_TEST_QCOM                                      0x0BC0
-#define GL_ALPHA_TEST_FUNC_QCOM                                 0x0BC1
-#define GL_ALPHA_TEST_REF_QCOM                                  0x0BC2
-#endif
-
-/* GL_QCOM_binning_control */
-#ifndef GL_QCOM_binning_control
-#define GL_BINNING_CONTROL_HINT_QCOM                            0x8FB0
-#define GL_CPU_OPTIMIZED_QCOM                                   0x8FB1
-#define GL_GPU_OPTIMIZED_QCOM                                   0x8FB2
-#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM                    0x8FB3
-#endif
-
-/* GL_QCOM_driver_control */
-/* No new tokens introduced by this extension. */
-
-/* GL_QCOM_extended_get */
-#ifndef GL_QCOM_extended_get
-#define GL_TEXTURE_WIDTH_QCOM                                   0x8BD2
-#define GL_TEXTURE_HEIGHT_QCOM                                  0x8BD3
-#define GL_TEXTURE_DEPTH_QCOM                                   0x8BD4
-#define GL_TEXTURE_INTERNAL_FORMAT_QCOM                         0x8BD5
-#define GL_TEXTURE_FORMAT_QCOM                                  0x8BD6
-#define GL_TEXTURE_TYPE_QCOM                                    0x8BD7
-#define GL_TEXTURE_IMAGE_VALID_QCOM                             0x8BD8
-#define GL_TEXTURE_NUM_LEVELS_QCOM                              0x8BD9
-#define GL_TEXTURE_TARGET_QCOM                                  0x8BDA
-#define GL_TEXTURE_OBJECT_VALID_QCOM                            0x8BDB
-#define GL_STATE_RESTORE                                        0x8BDC
-#endif
-
-/* GL_QCOM_extended_get2 */
-/* No new tokens introduced by this extension. */
-
-/* GL_QCOM_perfmon_global_mode */
-#ifndef GL_QCOM_perfmon_global_mode
-#define GL_PERFMON_GLOBAL_MODE_QCOM                             0x8FA0
-#endif
-
-/* GL_QCOM_writeonly_rendering */
-#ifndef GL_QCOM_writeonly_rendering
-#define GL_WRITEONLY_RENDERING_QCOM                             0x8823
-#endif
-
-/* GL_QCOM_tiled_rendering */
-#ifndef GL_QCOM_tiled_rendering
-#define GL_COLOR_BUFFER_BIT0_QCOM                               0x00000001
-#define GL_COLOR_BUFFER_BIT1_QCOM                               0x00000002
-#define GL_COLOR_BUFFER_BIT2_QCOM                               0x00000004
-#define GL_COLOR_BUFFER_BIT3_QCOM                               0x00000008
-#define GL_COLOR_BUFFER_BIT4_QCOM                               0x00000010
-#define GL_COLOR_BUFFER_BIT5_QCOM                               0x00000020
-#define GL_COLOR_BUFFER_BIT6_QCOM                               0x00000040
-#define GL_COLOR_BUFFER_BIT7_QCOM                               0x00000080
-#define GL_DEPTH_BUFFER_BIT0_QCOM                               0x00000100
-#define GL_DEPTH_BUFFER_BIT1_QCOM                               0x00000200
-#define GL_DEPTH_BUFFER_BIT2_QCOM                               0x00000400
-#define GL_DEPTH_BUFFER_BIT3_QCOM                               0x00000800
-#define GL_DEPTH_BUFFER_BIT4_QCOM                               0x00001000
-#define GL_DEPTH_BUFFER_BIT5_QCOM                               0x00002000
-#define GL_DEPTH_BUFFER_BIT6_QCOM                               0x00004000
-#define GL_DEPTH_BUFFER_BIT7_QCOM                               0x00008000
-#define GL_STENCIL_BUFFER_BIT0_QCOM                             0x00010000
-#define GL_STENCIL_BUFFER_BIT1_QCOM                             0x00020000
-#define GL_STENCIL_BUFFER_BIT2_QCOM                             0x00040000
-#define GL_STENCIL_BUFFER_BIT3_QCOM                             0x00080000
-#define GL_STENCIL_BUFFER_BIT4_QCOM                             0x00100000
-#define GL_STENCIL_BUFFER_BIT5_QCOM                             0x00200000
-#define GL_STENCIL_BUFFER_BIT6_QCOM                             0x00400000
-#define GL_STENCIL_BUFFER_BIT7_QCOM                             0x00800000
-#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM                         0x01000000
-#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM                         0x02000000
-#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM                         0x04000000
-#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM                         0x08000000
-#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM                         0x10000000
-#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM                         0x20000000
-#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM                         0x40000000
-#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM                         0x80000000
-#endif
-
-/*------------------------------------------------------------------------*
- * VIV extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_VIV_shader_binary */
-#ifndef GL_VIV_shader_binary
-#define GL_SHADER_BINARY_VIV                                    0x8FC4
-#endif
-
-/*------------------------------------------------------------------------*
- * End of extension tokens, start of corresponding extension functions
- *------------------------------------------------------------------------*/
-
-/*------------------------------------------------------------------------*
- * OES extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_OES_compressed_ETC1_RGB8_texture */
-#ifndef GL_OES_compressed_ETC1_RGB8_texture
-#define GL_OES_compressed_ETC1_RGB8_texture 1
-#endif
-
-/* GL_OES_compressed_paletted_texture */
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_OES_compressed_paletted_texture 1
-#endif
-
-/* GL_OES_depth24 */
-#ifndef GL_OES_depth24
-#define GL_OES_depth24 1
-#endif
-
-/* GL_OES_depth32 */
-#ifndef GL_OES_depth32
-#define GL_OES_depth32 1
-#endif
-
-/* GL_OES_depth_texture */
-#ifndef GL_OES_depth_texture
-#define GL_OES_depth_texture 1
-#endif
-
-/* GL_OES_EGL_image */
-#ifndef GL_OES_EGL_image
-#define GL_OES_EGL_image 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
-GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
-#endif
-typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
-typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
-#endif
-
-/* GL_OES_EGL_image_external */
-#ifndef GL_OES_EGL_image_external
-#define GL_OES_EGL_image_external 1
-/* glEGLImageTargetTexture2DOES defined in GL_OES_EGL_image already. */
-#endif
-
-/* GL_OES_element_index_uint */
-#ifndef GL_OES_element_index_uint
-#define GL_OES_element_index_uint 1
-#endif
-
-/* GL_OES_fbo_render_mipmap */
-#ifndef GL_OES_fbo_render_mipmap
-#define GL_OES_fbo_render_mipmap 1
-#endif
-
-/* GL_OES_fragment_precision_high */
-#ifndef GL_OES_fragment_precision_high
-#define GL_OES_fragment_precision_high 1
-#endif
-
-/* GL_OES_get_program_binary */
-#ifndef GL_OES_get_program_binary
-#define GL_OES_get_program_binary 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glGetProgramBinaryOES (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
-GL_APICALL void GL_APIENTRY glProgramBinaryOES (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length);
-#endif
-typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
-typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length);
-#endif
-
-/* GL_OES_mapbuffer */
-#ifndef GL_OES_mapbuffer
-#define GL_OES_mapbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access);
-GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target);
-GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, GLvoid** params);
-#endif
-typedef void* (GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access);
-typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target);
-typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, GLvoid** params);
-#endif
-
-/* GL_OES_packed_depth_stencil */
-#ifndef GL_OES_packed_depth_stencil
-#define GL_OES_packed_depth_stencil 1
-#endif
-
-/* GL_OES_required_internalformat */
-#ifndef GL_OES_required_internalformat
-#define GL_OES_required_internalformat 1
-#endif
-
-/* GL_OES_rgb8_rgba8 */
-#ifndef GL_OES_rgb8_rgba8
-#define GL_OES_rgb8_rgba8 1
-#endif
-
-/* GL_OES_standard_derivatives */
-#ifndef GL_OES_standard_derivatives
-#define GL_OES_standard_derivatives 1
-#endif
-
-/* GL_OES_stencil1 */
-#ifndef GL_OES_stencil1
-#define GL_OES_stencil1 1
-#endif
-
-/* GL_OES_stencil4 */
-#ifndef GL_OES_stencil4
-#define GL_OES_stencil4 1
-#endif
-
-#ifndef GL_OES_surfaceless_context
-#define GL_OES_surfaceless_context 1
-#endif
-
-/* GL_OES_texture_3D */
-#ifndef GL_OES_texture_3D
-#define GL_OES_texture_3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void GL_APIENTRY glTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void GL_APIENTRY glCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void GL_APIENTRY glCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void GL_APIENTRY glFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-#endif
-typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
-typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels);
-typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data);
-typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data);
-typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOES) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-#endif
-
-/* GL_OES_texture_float */
-#ifndef GL_OES_texture_float
-#define GL_OES_texture_float 1
-#endif
-
-/* GL_OES_texture_float_linear */
-#ifndef GL_OES_texture_float_linear
-#define GL_OES_texture_float_linear 1
-#endif
-
-/* GL_OES_texture_half_float */
-#ifndef GL_OES_texture_half_float
-#define GL_OES_texture_half_float 1
-#endif
-
-/* GL_OES_texture_half_float_linear */
-#ifndef GL_OES_texture_half_float_linear
-#define GL_OES_texture_half_float_linear 1
-#endif
-
-/* GL_OES_texture_npot */
-#ifndef GL_OES_texture_npot
-#define GL_OES_texture_npot 1
-#endif
-
-/* GL_OES_vertex_array_object */
-#ifndef GL_OES_vertex_array_object
-#define GL_OES_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glBindVertexArrayOES (GLuint array);
-GL_APICALL void GL_APIENTRY glDeleteVertexArraysOES (GLsizei n, const GLuint *arrays);
-GL_APICALL void GL_APIENTRY glGenVertexArraysOES (GLsizei n, GLuint *arrays);
-GL_APICALL GLboolean GL_APIENTRY glIsVertexArrayOES (GLuint array);
-#endif
-typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYOESPROC) (GLuint array);
-typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays);
-typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array);
-#endif
-
-/* GL_OES_vertex_half_float */
-#ifndef GL_OES_vertex_half_float
-#define GL_OES_vertex_half_float 1
-#endif
-
-/* GL_OES_vertex_type_10_10_10_2 */
-#ifndef GL_OES_vertex_type_10_10_10_2
-#define GL_OES_vertex_type_10_10_10_2 1
-#endif
-
-/*------------------------------------------------------------------------*
- * KHR extension functions
- *------------------------------------------------------------------------*/
-
-#ifndef GL_KHR_debug
-#define GL_KHR_debug 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-GL_APICALL void GL_APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-GL_APICALL void GL_APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam);
-GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-GL_APICALL void GL_APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message);
-GL_APICALL void GL_APIENTRY glPopDebugGroup (void);
-GL_APICALL void GL_APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
-GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
-GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label);
-GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
-GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params);
-#endif 
-typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
-typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
-typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void);
-typedef void (GL_APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
-typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label);
-typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (GL_APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, void **params);
-#endif
-
-#ifndef GL_KHR_texture_compression_astc_ldr
-#define GL_KHR_texture_compression_astc_ldr 1
-#endif
-
-
-/*------------------------------------------------------------------------*
- * AMD extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_AMD_compressed_3DC_texture */
-#ifndef GL_AMD_compressed_3DC_texture
-#define GL_AMD_compressed_3DC_texture 1
-#endif
-
-/* GL_AMD_compressed_ATC_texture */
-#ifndef GL_AMD_compressed_ATC_texture
-#define GL_AMD_compressed_ATC_texture 1
-#endif
-
-/* AMD_performance_monitor */
-#ifndef GL_AMD_performance_monitor
-#define GL_AMD_performance_monitor 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
-GL_APICALL void GL_APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
-GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
-GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
-GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data);
-GL_APICALL void GL_APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
-GL_APICALL void GL_APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
-GL_APICALL void GL_APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList);
-GL_APICALL void GL_APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
-GL_APICALL void GL_APIENTRY glEndPerfMonitorAMD (GLuint monitor);
-GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
-#endif
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data);
-typedef void (GL_APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
-typedef void (GL_APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
-typedef void (GL_APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList);
-typedef void (GL_APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
-typedef void (GL_APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
-#endif
-
-/* GL_AMD_program_binary_Z400 */
-#ifndef GL_AMD_program_binary_Z400
-#define GL_AMD_program_binary_Z400 1
-#endif
-
-/*------------------------------------------------------------------------*
- * ANGLE extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_ANGLE_framebuffer_blit */
-#ifndef GL_ANGLE_framebuffer_blit
-#define GL_ANGLE_framebuffer_blit 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glBlitFramebufferANGLE (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-#endif
-typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-#endif
-
-/* GL_ANGLE_framebuffer_multisample */
-#ifndef GL_ANGLE_framebuffer_multisample
-#define GL_ANGLE_framebuffer_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_ANGLE_instanced_arrays 
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
-GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index, GLuint divisor);
-#endif
-typedef void (GL_APIENTRYP PFLGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-typedef void (GL_APIENTRYP PFLGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
-typedef void (GL_APIENTRYP PFLGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor);
-#endif
-
-/* GL_ANGLE_pack_reverse_row_order */
-#ifndef GL_ANGLE_pack_reverse_row_order 
-#define GL_ANGLE_pack_reverse_row_order 1
-#endif
-
-/* GL_ANGLE_texture_compression_dxt3 */
-#ifndef GL_ANGLE_texture_compression_dxt3 
-#define GL_ANGLE_texture_compression_dxt3 1
-#endif
-
-/* GL_ANGLE_texture_compression_dxt5 */
-#ifndef GL_ANGLE_texture_compression_dxt5 
-#define GL_ANGLE_texture_compression_dxt5 1
-#endif
-
-/* GL_ANGLE_texture_usage */
-#ifndef GL_ANGLE_texture_usage 
-#define GL_ANGLE_texture_usage 1
-#endif
-
-#ifndef GL_ANGLE_translated_shader_source 
-#define GL_ANGLE_translated_shader_source 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
-#endif
-typedef void (GL_APIENTRYP PFLGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
-#endif
-
-/*------------------------------------------------------------------------*
- * APPLE extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_APPLE_copy_texture_levels */
-#ifndef GL_APPLE_copy_texture_levels
-#define GL_APPLE_copy_texture_levels 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);
-#endif
-typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);
-#endif
-
-/* GL_APPLE_framebuffer_multisample */
-#ifndef GL_APPLE_framebuffer_multisample
-#define GL_APPLE_framebuffer_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
-GL_APICALL void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void);
-#endif
-
-/* GL_APPLE_rgb_422 */
-#ifndef GL_APPLE_rgb_422
-#define GL_APPLE_rgb_422 1
-#endif
-
-/* GL_APPLE_sync */
-#ifndef GL_APPLE_sync
-#define GL_APPLE_sync 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags);
-GL_APICALL GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync);
-GL_APICALL void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync);
-GL_APICALL GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GL_APICALL void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GL_APICALL void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params);
-GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-#endif
-typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags);
-typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync);
-typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync);
-typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params);
-typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-#endif
-
-/* GL_APPLE_texture_format_BGRA8888 */
-#ifndef GL_APPLE_texture_format_BGRA8888
-#define GL_APPLE_texture_format_BGRA8888 1
-#endif
-
-/* GL_APPLE_texture_max_level */
-#ifndef GL_APPLE_texture_max_level
-#define GL_APPLE_texture_max_level 1
-#endif
-
-/*------------------------------------------------------------------------*
- * ARM extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_ARM_mali_program_binary */
-#ifndef GL_ARM_mali_program_binary
-#define GL_ARM_mali_program_binary 1
-#endif
-
-/* GL_ARM_mali_shader_binary */
-#ifndef GL_ARM_mali_shader_binary
-#define GL_ARM_mali_shader_binary 1
-#endif
-
-/* GL_ARM_rgba8 */
-#ifndef GL_ARM_rgba8
-#define GL_ARM_rgba8 1
-#endif
-
-/*------------------------------------------------------------------------*
- * EXT extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_EXT_blend_minmax */
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#endif
-
-/* GL_EXT_color_buffer_half_float */
-#ifndef GL_EXT_color_buffer_half_float
-#define GL_EXT_color_buffer_half_float 1
-#endif
-
-/* GL_EXT_debug_label */
-#ifndef GL_EXT_debug_label
-#define GL_EXT_debug_label 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label);
-GL_APICALL void GL_APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
-#endif
-typedef void (GL_APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label);
-typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
-#endif
-
-/* GL_EXT_debug_marker */
-#ifndef GL_EXT_debug_marker
-#define GL_EXT_debug_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker);
-GL_APICALL void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker);
-GL_APICALL void GL_APIENTRY glPopGroupMarkerEXT (void);
-#endif
-typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
-typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
-typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void);
-#endif
-
-/* GL_EXT_discard_framebuffer */
-#ifndef GL_EXT_discard_framebuffer
-#define GL_EXT_discard_framebuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttachments, const GLenum *attachments);
-#endif
-typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
-#endif
-
-/* GL_EXT_map_buffer_range */
-#ifndef GL_EXT_map_buffer_range
-#define GL_EXT_map_buffer_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void* GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length);
-#endif
-typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
-#endif
-
-/* GL_EXT_multisampled_render_to_texture */
-#ifndef GL_EXT_multisampled_render_to_texture
-#define GL_EXT_multisampled_render_to_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
-GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);
-#endif
-typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
-#endif
-
-/* GL_EXT_multiview_draw_buffers */
-#ifndef GL_EXT_multiview_draw_buffers
-#define GL_EXT_multiview_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glReadBufferIndexedEXT (GLenum src, GLint index);
-GL_APICALL void GL_APIENTRY glDrawBuffersIndexedEXT (GLint n, const GLenum *location, const GLint *indices);
-GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLint *data);
-#endif
-typedef void (GL_APIENTRYP PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index);
-typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices);
-typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
-GL_APICALL void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-/* GL_EXT_occlusion_query_boolean */
-#ifndef GL_EXT_occlusion_query_boolean
-#define GL_EXT_occlusion_query_boolean 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids);
-GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint *ids);
-GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id);
-GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id);
-GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target);
-GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params);
-#endif
-typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids);
-typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id);
-typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id);
-typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target);
-typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-/* GL_EXT_read_format_bgra */
-#ifndef GL_EXT_read_format_bgra
-#define GL_EXT_read_format_bgra 1
-#endif
-
-/* GL_EXT_robustness */
-#ifndef GL_EXT_robustness
-#define GL_EXT_robustness 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void);
-GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
-GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, float *params);
-GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params);
-#endif
-typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void);
-typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
-typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, float *params);
-typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
-#endif
-
-/* GL_EXT_separate_shader_objects */
-#ifndef GL_EXT_separate_shader_objects
-#define GL_EXT_separate_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glUseProgramStagesEXT (GLuint pipeline, GLbitfield stages, GLuint program);
-GL_APICALL void GL_APIENTRY glActiveShaderProgramEXT (GLuint pipeline, GLuint program);
-GL_APICALL GLuint GL_APIENTRY glCreateShaderProgramvEXT (GLenum type, GLsizei count, const GLchar **strings);
-GL_APICALL void GL_APIENTRY glBindProgramPipelineEXT (GLuint pipeline);
-GL_APICALL void GL_APIENTRY glDeleteProgramPipelinesEXT (GLsizei n, const GLuint *pipelines);
-GL_APICALL void GL_APIENTRY glGenProgramPipelinesEXT (GLsizei n, GLuint *pipelines);
-GL_APICALL GLboolean GL_APIENTRY glIsProgramPipelineEXT (GLuint pipeline);
-GL_APICALL void GL_APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
-GL_APICALL void GL_APIENTRY glGetProgramPipelineivEXT (GLuint pipeline, GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint x);
-GL_APICALL void GL_APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint x, GLint y);
-GL_APICALL void GL_APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z);
-GL_APICALL void GL_APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
-GL_APICALL void GL_APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat x);
-GL_APICALL void GL_APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat x, GLfloat y);
-GL_APICALL void GL_APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void GL_APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GL_APICALL void GL_APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GL_APICALL void GL_APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GL_APICALL void GL_APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GL_APICALL void GL_APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
-GL_APICALL void GL_APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glValidateProgramPipelineEXT (GLuint pipeline);
-GL_APICALL void GL_APIENTRY glGetProgramPipelineInfoLogEXT (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-#endif
-typedef void (GL_APIENTRYP PFNGLUSEPROGRAMSTAGESEXTPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
-typedef void (GL_APIENTRYP PFNGLACTIVESHADERPROGRAMEXTPROC) (GLuint pipeline, GLuint program);
-typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROGRAMVEXTPROC) (GLenum type, GLsizei count, const GLchar **strings);
-typedef void (GL_APIENTRYP PFNGLBINDPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
-typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei n, const GLuint *pipelines);
-typedef void (GL_APIENTRYP PFNGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n, GLuint *pipelines);
-typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
-typedef void (GL_APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
-typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint pipeline, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint x);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint x, GLint y);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat x);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
-typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-#endif
-
-/* GL_EXT_shader_framebuffer_fetch */
-#ifndef GL_EXT_shader_framebuffer_fetch
-#define GL_EXT_shader_framebuffer_fetch 1
-#endif
-
-/* GL_EXT_shader_texture_lod */
-#ifndef GL_EXT_shader_texture_lod
-#define GL_EXT_shader_texture_lod 1
-#endif
-
-/* GL_EXT_shadow_samplers */
-#ifndef GL_EXT_shadow_samplers
-#define GL_EXT_shadow_samplers 1
-#endif
-
-/* GL_EXT_sRGB */
-#ifndef GL_EXT_sRGB
-#define GL_EXT_sRGB 1
-#endif
-
-/* GL_EXT_texture_compression_dxt1 */
-#ifndef GL_EXT_texture_compression_dxt1
-#define GL_EXT_texture_compression_dxt1 1
-#endif
-
-/* GL_EXT_texture_filter_anisotropic */
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-/* GL_EXT_texture_format_BGRA8888 */
-#ifndef GL_EXT_texture_format_BGRA8888
-#define GL_EXT_texture_format_BGRA8888 1
-#endif
-
-/* GL_EXT_texture_rg */
-#ifndef GL_EXT_texture_rg
-#define GL_EXT_texture_rg 1
-#endif
-
-/* GL_EXT_texture_storage */
-#ifndef GL_EXT_texture_storage
-#define GL_EXT_texture_storage 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-GL_APICALL void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-GL_APICALL void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-GL_APICALL void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-#endif
-typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-#endif
-
-/* GL_EXT_texture_type_2_10_10_10_REV */
-#ifndef GL_EXT_texture_type_2_10_10_10_REV
-#define GL_EXT_texture_type_2_10_10_10_REV 1
-#endif
-
-/* GL_EXT_unpack_subimage */
-#ifndef GL_EXT_unpack_subimage
-#define GL_EXT_unpack_subimage 1
-#endif
-
-/*------------------------------------------------------------------------*
- * DMP extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_DMP_shader_binary */
-#ifndef GL_DMP_shader_binary
-#define GL_DMP_shader_binary 1
-#endif
-
-/*------------------------------------------------------------------------*
- * FJ extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_FJ_shader_binary_GCCSO */
-#ifndef GL_FJ_shader_binary_GCCSO
-#define GL_FJ_shader_binary_GCCSO 1
-#endif
-
-/*------------------------------------------------------------------------*
- * IMG extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_IMG_program_binary */
-#ifndef GL_IMG_program_binary
-#define GL_IMG_program_binary 1
-#endif
-
-/* GL_IMG_read_format */
-#ifndef GL_IMG_read_format
-#define GL_IMG_read_format 1
-#endif
-
-/* GL_IMG_shader_binary */
-#ifndef GL_IMG_shader_binary
-#define GL_IMG_shader_binary 1
-#endif
-
-/* GL_IMG_texture_compression_pvrtc */
-#ifndef GL_IMG_texture_compression_pvrtc
-#define GL_IMG_texture_compression_pvrtc 1
-#endif
-
-/* GL_IMG_multisampled_render_to_texture */
-#ifndef GL_IMG_multisampled_render_to_texture
-#define GL_IMG_multisampled_render_to_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
-GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);
-#endif
-typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
-#endif
-
-/*------------------------------------------------------------------------*
- * NV extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_NV_coverage_sample */
-#ifndef GL_NV_coverage_sample
-#define GL_NV_coverage_sample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glCoverageMaskNV (GLboolean mask);
-GL_APICALL void GL_APIENTRY glCoverageOperationNV (GLenum operation);
-#endif
-typedef void (GL_APIENTRYP PFNGLCOVERAGEMASKNVPROC) (GLboolean mask);
-typedef void (GL_APIENTRYP PFNGLCOVERAGEOPERATIONNVPROC) (GLenum operation);
-#endif
-
-/* GL_NV_depth_nonlinear */
-#ifndef GL_NV_depth_nonlinear
-#define GL_NV_depth_nonlinear 1
-#endif
-
-/* GL_NV_draw_buffers */
-#ifndef GL_NV_draw_buffers
-#define GL_NV_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glDrawBuffersNV (GLsizei n, const GLenum *bufs);
-#endif
-typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-/* GL_NV_fbo_color_attachments */
-#ifndef GL_NV_fbo_color_attachments
-#define GL_NV_fbo_color_attachments 1
-#endif
-
-/* GL_NV_fence */
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
-GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei, GLuint *);
-GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint);
-GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint);
-GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
-GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint);
-GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint, GLenum);
-#endif
-typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-/* GL_NV_read_buffer */
-#ifndef GL_NV_read_buffer
-#define GL_NV_read_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glReadBufferNV (GLenum mode);
-#endif
-typedef void (GL_APIENTRYP PFNGLREADBUFFERNVPROC) (GLenum mode);
-#endif
-
-/* GL_NV_read_buffer_front */
-#ifndef GL_NV_read_buffer_front
-#define GL_NV_read_buffer_front 1
-#endif
-
-/* GL_NV_read_depth */
-#ifndef GL_NV_read_depth
-#define GL_NV_read_depth 1
-#endif
-
-/* GL_NV_read_depth_stencil */
-#ifndef GL_NV_read_depth_stencil
-#define GL_NV_read_depth_stencil 1
-#endif
-
-/* GL_NV_read_stencil */
-#ifndef GL_NV_read_stencil
-#define GL_NV_read_stencil 1
-#endif
-
-/* GL_NV_texture_compression_s3tc_update */
-#ifndef GL_NV_texture_compression_s3tc_update
-#define GL_NV_texture_compression_s3tc_update 1
-#endif
-
-/* GL_NV_texture_npot_2D_mipmap */
-#ifndef GL_NV_texture_npot_2D_mipmap
-#define GL_NV_texture_npot_2D_mipmap 1
-#endif
-
-/*------------------------------------------------------------------------*
- * QCOM extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_QCOM_alpha_test */
-#ifndef GL_QCOM_alpha_test
-#define GL_QCOM_alpha_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glAlphaFuncQCOM (GLenum func, GLclampf ref);
-#endif
-typedef void (GL_APIENTRYP PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref);
-#endif
-
-/* GL_QCOM_binning_control */
-#ifndef GL_QCOM_binning_control
-#define GL_QCOM_binning_control 1
-#endif
-
-/* GL_QCOM_driver_control */
-#ifndef GL_QCOM_driver_control
-#define GL_QCOM_driver_control 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glGetDriverControlsQCOM (GLint *num, GLsizei size, GLuint *driverControls);
-GL_APICALL void GL_APIENTRY glGetDriverControlStringQCOM (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString);
-GL_APICALL void GL_APIENTRY glEnableDriverControlQCOM (GLuint driverControl);
-GL_APICALL void GL_APIENTRY glDisableDriverControlQCOM (GLuint driverControl);
-#endif
-typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls);
-typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString);
-typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
-typedef void (GL_APIENTRYP PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
-#endif
-
-/* GL_QCOM_extended_get */
-#ifndef GL_QCOM_extended_get
-#define GL_QCOM_extended_get 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glExtGetTexturesQCOM (GLuint *textures, GLint maxTextures, GLint *numTextures);
-GL_APICALL void GL_APIENTRY glExtGetBuffersQCOM (GLuint *buffers, GLint maxBuffers, GLint *numBuffers);
-GL_APICALL void GL_APIENTRY glExtGetRenderbuffersQCOM (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers);
-GL_APICALL void GL_APIENTRY glExtGetFramebuffersQCOM (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers);
-GL_APICALL void GL_APIENTRY glExtGetTexLevelParameterivQCOM (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glExtTexObjectStateOverrideiQCOM (GLenum target, GLenum pname, GLint param);
-GL_APICALL void GL_APIENTRY glExtGetTexSubImageQCOM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels);
-GL_APICALL void GL_APIENTRY glExtGetBufferPointervQCOM (GLenum target, GLvoid **params);
-#endif
-typedef void (GL_APIENTRYP PFNGLEXTGETTEXTURESQCOMPROC) (GLuint *textures, GLint maxTextures, GLint *numTextures);
-typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERSQCOMPROC) (GLuint *buffers, GLint maxBuffers, GLint *numBuffers);
-typedef void (GL_APIENTRYP PFNGLEXTGETRENDERBUFFERSQCOMPROC) (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers);
-typedef void (GL_APIENTRYP PFNGLEXTGETFRAMEBUFFERSQCOMPROC) (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers);
-typedef void (GL_APIENTRYP PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (GL_APIENTRYP PFNGLEXTGETTEXSUBIMAGEQCOMPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels);
-typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERPOINTERVQCOMPROC) (GLenum target, GLvoid **params);
-#endif
-
-/* GL_QCOM_extended_get2 */
-#ifndef GL_QCOM_extended_get2
-#define GL_QCOM_extended_get2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glExtGetShadersQCOM (GLuint *shaders, GLint maxShaders, GLint *numShaders);
-GL_APICALL void GL_APIENTRY glExtGetProgramsQCOM (GLuint *programs, GLint maxPrograms, GLint *numPrograms);
-GL_APICALL GLboolean GL_APIENTRY glExtIsProgramBinaryQCOM (GLuint program);
-GL_APICALL void GL_APIENTRY glExtGetProgramBinarySourceQCOM (GLuint program, GLenum shadertype, GLchar *source, GLint *length);
-#endif
-typedef void (GL_APIENTRYP PFNGLEXTGETSHADERSQCOMPROC) (GLuint *shaders, GLint maxShaders, GLint *numShaders);
-typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMSQCOMPROC) (GLuint *programs, GLint maxPrograms, GLint *numPrograms);
-typedef GLboolean (GL_APIENTRYP PFNGLEXTISPROGRAMBINARYQCOMPROC) (GLuint program);
-typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC) (GLuint program, GLenum shadertype, GLchar *source, GLint *length);
-#endif
-
-/* GL_QCOM_perfmon_global_mode */
-#ifndef GL_QCOM_perfmon_global_mode
-#define GL_QCOM_perfmon_global_mode 1
-#endif
-
-/* GL_QCOM_writeonly_rendering */
-#ifndef GL_QCOM_writeonly_rendering
-#define GL_QCOM_writeonly_rendering 1
-#endif
-
-/* GL_QCOM_tiled_rendering */
-#ifndef GL_QCOM_tiled_rendering
-#define GL_QCOM_tiled_rendering 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glStartTilingQCOM (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask);
-GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask);
-#endif
-typedef void (GL_APIENTRYP PFNGLSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask);
-typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask);
-#endif
-
-/*------------------------------------------------------------------------*
- * VIV extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_VIV_shader_binary */
-#ifndef GL_VIV_shader_binary
-#define GL_VIV_shader_binary 1
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gl2ext_h_ */
-
-#endif /* _MSC_VER */
-
-#ifndef APIENTRY
-#define APIENTRY GL_APIENTRY
-#endif
diff --git a/linux-x86/include/SDL2/SDL_pixels.h b/linux-x86/include/SDL2/SDL_pixels.h
deleted file mode 100644
index 3131af7..0000000
--- a/linux-x86/include/SDL2/SDL_pixels.h
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_pixels.h
- *
- *  Header for the enumerated pixel format definitions.
- */
-
-#ifndef _SDL_pixels_h
-#define _SDL_pixels_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \name Transparency definitions
- *
- *  These define alpha as the opacity of a surface.
- */
-/* @{ */
-#define SDL_ALPHA_OPAQUE 255
-#define SDL_ALPHA_TRANSPARENT 0
-/* @} */
-
-/** Pixel type. */
-enum
-{
-    SDL_PIXELTYPE_UNKNOWN,
-    SDL_PIXELTYPE_INDEX1,
-    SDL_PIXELTYPE_INDEX4,
-    SDL_PIXELTYPE_INDEX8,
-    SDL_PIXELTYPE_PACKED8,
-    SDL_PIXELTYPE_PACKED16,
-    SDL_PIXELTYPE_PACKED32,
-    SDL_PIXELTYPE_ARRAYU8,
-    SDL_PIXELTYPE_ARRAYU16,
-    SDL_PIXELTYPE_ARRAYU32,
-    SDL_PIXELTYPE_ARRAYF16,
-    SDL_PIXELTYPE_ARRAYF32
-};
-
-/** Bitmap pixel order, high bit -> low bit. */
-enum
-{
-    SDL_BITMAPORDER_NONE,
-    SDL_BITMAPORDER_4321,
-    SDL_BITMAPORDER_1234
-};
-
-/** Packed component order, high bit -> low bit. */
-enum
-{
-    SDL_PACKEDORDER_NONE,
-    SDL_PACKEDORDER_XRGB,
-    SDL_PACKEDORDER_RGBX,
-    SDL_PACKEDORDER_ARGB,
-    SDL_PACKEDORDER_RGBA,
-    SDL_PACKEDORDER_XBGR,
-    SDL_PACKEDORDER_BGRX,
-    SDL_PACKEDORDER_ABGR,
-    SDL_PACKEDORDER_BGRA
-};
-
-/** Array component order, low byte -> high byte. */
-enum
-{
-    SDL_ARRAYORDER_NONE,
-    SDL_ARRAYORDER_RGB,
-    SDL_ARRAYORDER_RGBA,
-    SDL_ARRAYORDER_ARGB,
-    SDL_ARRAYORDER_BGR,
-    SDL_ARRAYORDER_BGRA,
-    SDL_ARRAYORDER_ABGR
-};
-
-/** Packed component layout. */
-enum
-{
-    SDL_PACKEDLAYOUT_NONE,
-    SDL_PACKEDLAYOUT_332,
-    SDL_PACKEDLAYOUT_4444,
-    SDL_PACKEDLAYOUT_1555,
-    SDL_PACKEDLAYOUT_5551,
-    SDL_PACKEDLAYOUT_565,
-    SDL_PACKEDLAYOUT_8888,
-    SDL_PACKEDLAYOUT_2101010,
-    SDL_PACKEDLAYOUT_1010102
-};
-
-#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D)
-
-#define SDL_DEFINE_PIXELFORMAT(type, order, layout, bits, bytes) \
-    ((1 << 28) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \
-     ((bits) << 8) | ((bytes) << 0))
-
-#define SDL_PIXELFLAG(X)    (((X) >> 28) & 0x0F)
-#define SDL_PIXELTYPE(X)    (((X) >> 24) & 0x0F)
-#define SDL_PIXELORDER(X)   (((X) >> 20) & 0x0F)
-#define SDL_PIXELLAYOUT(X)  (((X) >> 16) & 0x0F)
-#define SDL_BITSPERPIXEL(X) (((X) >> 8) & 0xFF)
-#define SDL_BYTESPERPIXEL(X) \
-    (SDL_ISPIXELFORMAT_FOURCC(X) ? \
-        ((((X) == SDL_PIXELFORMAT_YUY2) || \
-          ((X) == SDL_PIXELFORMAT_UYVY) || \
-          ((X) == SDL_PIXELFORMAT_YVYU)) ? 2 : 1) : (((X) >> 0) & 0xFF))
-
-#define SDL_ISPIXELFORMAT_INDEXED(format)   \
-    (!SDL_ISPIXELFORMAT_FOURCC(format) && \
-     ((SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX1) || \
-      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX4) || \
-      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX8)))
-
-#define SDL_ISPIXELFORMAT_ALPHA(format)   \
-    (!SDL_ISPIXELFORMAT_FOURCC(format) && \
-     ((SDL_PIXELORDER(format) == SDL_PACKEDORDER_ARGB) || \
-      (SDL_PIXELORDER(format) == SDL_PACKEDORDER_RGBA) || \
-      (SDL_PIXELORDER(format) == SDL_PACKEDORDER_ABGR) || \
-      (SDL_PIXELORDER(format) == SDL_PACKEDORDER_BGRA)))
-
-/* The flag is set to 1 because 0x1? is not in the printable ASCII range */
-#define SDL_ISPIXELFORMAT_FOURCC(format)    \
-    ((format) && (SDL_PIXELFLAG(format) != 1))
-
-/* Note: If you modify this list, update SDL_GetPixelFormatName() */
-enum
-{
-    SDL_PIXELFORMAT_UNKNOWN,
-    SDL_PIXELFORMAT_INDEX1LSB =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_4321, 0,
-                               1, 0),
-    SDL_PIXELFORMAT_INDEX1MSB =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_1234, 0,
-                               1, 0),
-    SDL_PIXELFORMAT_INDEX4LSB =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_4321, 0,
-                               4, 0),
-    SDL_PIXELFORMAT_INDEX4MSB =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_1234, 0,
-                               4, 0),
-    SDL_PIXELFORMAT_INDEX8 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX8, 0, 0, 8, 1),
-    SDL_PIXELFORMAT_RGB332 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB,
-                               SDL_PACKEDLAYOUT_332, 8, 1),
-    SDL_PIXELFORMAT_RGB444 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
-                               SDL_PACKEDLAYOUT_4444, 12, 2),
-    SDL_PIXELFORMAT_RGB555 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
-                               SDL_PACKEDLAYOUT_1555, 15, 2),
-    SDL_PIXELFORMAT_BGR555 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR,
-                               SDL_PACKEDLAYOUT_1555, 15, 2),
-    SDL_PIXELFORMAT_ARGB4444 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB,
-                               SDL_PACKEDLAYOUT_4444, 16, 2),
-    SDL_PIXELFORMAT_RGBA4444 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA,
-                               SDL_PACKEDLAYOUT_4444, 16, 2),
-    SDL_PIXELFORMAT_ABGR4444 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR,
-                               SDL_PACKEDLAYOUT_4444, 16, 2),
-    SDL_PIXELFORMAT_BGRA4444 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA,
-                               SDL_PACKEDLAYOUT_4444, 16, 2),
-    SDL_PIXELFORMAT_ARGB1555 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB,
-                               SDL_PACKEDLAYOUT_1555, 16, 2),
-    SDL_PIXELFORMAT_RGBA5551 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA,
-                               SDL_PACKEDLAYOUT_5551, 16, 2),
-    SDL_PIXELFORMAT_ABGR1555 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR,
-                               SDL_PACKEDLAYOUT_1555, 16, 2),
-    SDL_PIXELFORMAT_BGRA5551 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA,
-                               SDL_PACKEDLAYOUT_5551, 16, 2),
-    SDL_PIXELFORMAT_RGB565 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
-                               SDL_PACKEDLAYOUT_565, 16, 2),
-    SDL_PIXELFORMAT_BGR565 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR,
-                               SDL_PACKEDLAYOUT_565, 16, 2),
-    SDL_PIXELFORMAT_RGB24 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_RGB, 0,
-                               24, 3),
-    SDL_PIXELFORMAT_BGR24 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0,
-                               24, 3),
-    SDL_PIXELFORMAT_RGB888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB,
-                               SDL_PACKEDLAYOUT_8888, 24, 4),
-    SDL_PIXELFORMAT_RGBX8888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBX,
-                               SDL_PACKEDLAYOUT_8888, 24, 4),
-    SDL_PIXELFORMAT_BGR888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR,
-                               SDL_PACKEDLAYOUT_8888, 24, 4),
-    SDL_PIXELFORMAT_BGRX8888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRX,
-                               SDL_PACKEDLAYOUT_8888, 24, 4),
-    SDL_PIXELFORMAT_ARGB8888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
-                               SDL_PACKEDLAYOUT_8888, 32, 4),
-    SDL_PIXELFORMAT_RGBA8888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBA,
-                               SDL_PACKEDLAYOUT_8888, 32, 4),
-    SDL_PIXELFORMAT_ABGR8888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR,
-                               SDL_PACKEDLAYOUT_8888, 32, 4),
-    SDL_PIXELFORMAT_BGRA8888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRA,
-                               SDL_PACKEDLAYOUT_8888, 32, 4),
-    SDL_PIXELFORMAT_ARGB2101010 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
-                               SDL_PACKEDLAYOUT_2101010, 32, 4),
-
-    SDL_PIXELFORMAT_YV12 =      /**< Planar mode: Y + V + U  (3 planes) */
-        SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'),
-    SDL_PIXELFORMAT_IYUV =      /**< Planar mode: Y + U + V  (3 planes) */
-        SDL_DEFINE_PIXELFOURCC('I', 'Y', 'U', 'V'),
-    SDL_PIXELFORMAT_YUY2 =      /**< Packed mode: Y0+U0+Y1+V0 (1 plane) */
-        SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2'),
-    SDL_PIXELFORMAT_UYVY =      /**< Packed mode: U0+Y0+V0+Y1 (1 plane) */
-        SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'),
-    SDL_PIXELFORMAT_YVYU =      /**< Packed mode: Y0+V0+Y1+U0 (1 plane) */
-        SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U')
-};
-
-typedef struct SDL_Color
-{
-    Uint8 r;
-    Uint8 g;
-    Uint8 b;
-    Uint8 a;
-} SDL_Color;
-#define SDL_Colour SDL_Color
-
-typedef struct SDL_Palette
-{
-    int ncolors;
-    SDL_Color *colors;
-    Uint32 version;
-    int refcount;
-} SDL_Palette;
-
-/**
- *  \note Everything in the pixel format structure is read-only.
- */
-typedef struct SDL_PixelFormat
-{
-    Uint32 format;
-    SDL_Palette *palette;
-    Uint8 BitsPerPixel;
-    Uint8 BytesPerPixel;
-    Uint8 padding[2];
-    Uint32 Rmask;
-    Uint32 Gmask;
-    Uint32 Bmask;
-    Uint32 Amask;
-    Uint8 Rloss;
-    Uint8 Gloss;
-    Uint8 Bloss;
-    Uint8 Aloss;
-    Uint8 Rshift;
-    Uint8 Gshift;
-    Uint8 Bshift;
-    Uint8 Ashift;
-    int refcount;
-    struct SDL_PixelFormat *next;
-} SDL_PixelFormat;
-
-/**
- * \brief Get the human readable name of a pixel format
- */
-extern DECLSPEC const char* SDLCALL SDL_GetPixelFormatName(Uint32 format);
-
-/**
- *  \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks.
- *
- *  \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible.
- *
- *  \sa SDL_MasksToPixelFormatEnum()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format,
-                                                            int *bpp,
-                                                            Uint32 * Rmask,
-                                                            Uint32 * Gmask,
-                                                            Uint32 * Bmask,
-                                                            Uint32 * Amask);
-
-/**
- *  \brief Convert a bpp and RGBA masks to an enumerated pixel format.
- *
- *  \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion
- *          wasn't possible.
- *
- *  \sa SDL_PixelFormatEnumToMasks()
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp,
-                                                          Uint32 Rmask,
-                                                          Uint32 Gmask,
-                                                          Uint32 Bmask,
-                                                          Uint32 Amask);
-
-/**
- *  \brief Create an SDL_PixelFormat structure from a pixel format enum.
- */
-extern DECLSPEC SDL_PixelFormat * SDLCALL SDL_AllocFormat(Uint32 pixel_format);
-
-/**
- *  \brief Free an SDL_PixelFormat structure.
- */
-extern DECLSPEC void SDLCALL SDL_FreeFormat(SDL_PixelFormat *format);
-
-/**
- *  \brief Create a palette structure with the specified number of color
- *         entries.
- *
- *  \return A new palette, or NULL if there wasn't enough memory.
- *
- *  \note The palette entries are initialized to white.
- *
- *  \sa SDL_FreePalette()
- */
-extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors);
-
-/**
- *  \brief Set the palette for a pixel format structure.
- */
-extern DECLSPEC int SDLCALL SDL_SetPixelFormatPalette(SDL_PixelFormat * format,
-                                                      SDL_Palette *palette);
-
-/**
- *  \brief Set a range of colors in a palette.
- *
- *  \param palette    The palette to modify.
- *  \param colors     An array of colors to copy into the palette.
- *  \param firstcolor The index of the first palette entry to modify.
- *  \param ncolors    The number of entries to modify.
- *
- *  \return 0 on success, or -1 if not all of the colors could be set.
- */
-extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette,
-                                                 const SDL_Color * colors,
-                                                 int firstcolor, int ncolors);
-
-/**
- *  \brief Free a palette created with SDL_AllocPalette().
- *
- *  \sa SDL_AllocPalette()
- */
-extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette);
-
-/**
- *  \brief Maps an RGB triple to an opaque pixel value for a given pixel format.
- *
- *  \sa SDL_MapRGBA
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format,
-                                          Uint8 r, Uint8 g, Uint8 b);
-
-/**
- *  \brief Maps an RGBA quadruple to a pixel value for a given pixel format.
- *
- *  \sa SDL_MapRGB
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format,
-                                           Uint8 r, Uint8 g, Uint8 b,
-                                           Uint8 a);
-
-/**
- *  \brief Get the RGB components from a pixel of the specified format.
- *
- *  \sa SDL_GetRGBA
- */
-extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel,
-                                        const SDL_PixelFormat * format,
-                                        Uint8 * r, Uint8 * g, Uint8 * b);
-
-/**
- *  \brief Get the RGBA components from a pixel of the specified format.
- *
- *  \sa SDL_GetRGB
- */
-extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel,
-                                         const SDL_PixelFormat * format,
-                                         Uint8 * r, Uint8 * g, Uint8 * b,
-                                         Uint8 * a);
-
-/**
- *  \brief Calculate a 256 entry gamma ramp for a gamma value.
- */
-extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_pixels_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_platform.h b/linux-x86/include/SDL2/SDL_platform.h
deleted file mode 100644
index c43f4b5..0000000
--- a/linux-x86/include/SDL2/SDL_platform.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_platform.h
- *
- *  Try to get a standard set of platform defines.
- */
-
-#ifndef _SDL_platform_h
-#define _SDL_platform_h
-
-#if defined(_AIX)
-#undef __AIX__
-#define __AIX__     1
-#endif
-#if defined(__HAIKU__)
-#undef __HAIKU__
-#define __HAIKU__   1
-#endif
-#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
-#undef __BSDI__
-#define __BSDI__    1
-#endif
-#if defined(_arch_dreamcast)
-#undef __DREAMCAST__
-#define __DREAMCAST__   1
-#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#undef __FREEBSD__
-#define __FREEBSD__ 1
-#endif
-#if defined(hpux) || defined(__hpux) || defined(__hpux__)
-#undef __HPUX__
-#define __HPUX__    1
-#endif
-#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
-#undef __IRIX__
-#define __IRIX__    1
-#endif
-#if defined(linux) || defined(__linux) || defined(__linux__)
-#undef __LINUX__
-#define __LINUX__   1
-#endif
-#if defined(ANDROID) || defined(__ANDROID__)
-#undef __ANDROID__
-#undef __LINUX__ /* do we need to do this? */
-#define __ANDROID__ 1
-#endif
-
-#if defined(__APPLE__)
-/* lets us know what version of Mac OS X we're compiling on */
-#include "AvailabilityMacros.h"
-#include "TargetConditionals.h"
-#if TARGET_OS_IPHONE
-/* if compiling for iPhone */
-#undef __IPHONEOS__
-#define __IPHONEOS__ 1
-#undef __MACOSX__
-#else
-/* if not compiling for iPhone */
-#undef __MACOSX__
-#define __MACOSX__  1
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
-# error SDL for Mac OS X only supports deploying on 10.5 and above.
-#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1050 */
-#endif /* TARGET_OS_IPHONE */
-#endif /* defined(__APPLE__) */
-
-#if defined(__NetBSD__)
-#undef __NETBSD__
-#define __NETBSD__  1
-#endif
-#if defined(__OpenBSD__)
-#undef __OPENBSD__
-#define __OPENBSD__ 1
-#endif
-#if defined(__OS2__)
-#undef __OS2__
-#define __OS2__     1
-#endif
-#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
-#undef __OSF__
-#define __OSF__     1
-#endif
-#if defined(__QNXNTO__)
-#undef __QNXNTO__
-#define __QNXNTO__  1
-#endif
-#if defined(riscos) || defined(__riscos) || defined(__riscos__)
-#undef __RISCOS__
-#define __RISCOS__  1
-#endif
-#if defined(__SVR4)
-#undef __SOLARIS__
-#define __SOLARIS__ 1
-#endif
-
-#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
-/* Try to find out if we're compiling for WinRT or non-WinRT */
-/* If _USING_V110_SDK71_ is defined it means we are using the v110_xp or v120_xp toolset. */
-#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1700) && !_USING_V110_SDK71_)	/* _MSC_VER==1700 for MSVC 2012 */
-#include <winapifamily.h>
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#undef __WINDOWS__
-#define __WINDOWS__   1
-/* See if we're compiling for WinRT: */
-#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-#undef __WINRT__
-#define __WINRT__ 1
-#endif
-#else
-#undef __WINDOWS__
-#define __WINDOWS__   1
-#endif /* _MSC_VER < 1700 */
-#endif /* defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) */
-
-#if defined(__WINDOWS__)
-#undef __WIN32__
-#define __WIN32__ 1
-#endif
-#if defined(__PSP__)
-#undef __PSP__
-#define __PSP__ 1
-#endif
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \brief Gets the name of the platform.
- */
-extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_platform_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_power.h b/linux-x86/include/SDL2/SDL_power.h
deleted file mode 100644
index cf71c98..0000000
--- a/linux-x86/include/SDL2/SDL_power.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_power_h
-#define _SDL_power_h
-
-/**
- *  \file SDL_power.h
- *
- *  Header for the SDL power management routines.
- */
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \brief The basic state for the system's power supply.
- */
-typedef enum
-{
-    SDL_POWERSTATE_UNKNOWN,      /**< cannot determine power status */
-    SDL_POWERSTATE_ON_BATTERY,   /**< Not plugged in, running on the battery */
-    SDL_POWERSTATE_NO_BATTERY,   /**< Plugged in, no battery available */
-    SDL_POWERSTATE_CHARGING,     /**< Plugged in, charging battery */
-    SDL_POWERSTATE_CHARGED       /**< Plugged in, battery charged */
-} SDL_PowerState;
-
-
-/**
- *  \brief Get the current power supply details.
- *
- *  \param secs Seconds of battery life left. You can pass a NULL here if
- *              you don't care. Will return -1 if we can't determine a
- *              value, or we're not running on a battery.
- *
- *  \param pct Percentage of battery life left, between 0 and 100. You can
- *             pass a NULL here if you don't care. Will return -1 if we
- *             can't determine a value, or we're not running on a battery.
- *
- *  \return The state of the battery (if any).
- */
-extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_power_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_quit.h b/linux-x86/include/SDL2/SDL_quit.h
deleted file mode 100644
index 8a78644..0000000
--- a/linux-x86/include/SDL2/SDL_quit.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_quit.h
- *
- *  Include file for SDL quit event handling.
- */
-
-#ifndef _SDL_quit_h
-#define _SDL_quit_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-/**
- *  \file SDL_quit.h
- *
- *  An ::SDL_QUIT event is generated when the user tries to close the application
- *  window.  If it is ignored or filtered out, the window will remain open.
- *  If it is not ignored or filtered, it is queued normally and the window
- *  is allowed to close.  When the window is closed, screen updates will
- *  complete, but have no effect.
- *
- *  SDL_Init() installs signal handlers for SIGINT (keyboard interrupt)
- *  and SIGTERM (system termination request), if handlers do not already
- *  exist, that generate ::SDL_QUIT events as well.  There is no way
- *  to determine the cause of an ::SDL_QUIT event, but setting a signal
- *  handler in your application will override the default generation of
- *  quit events for that signal.
- *
- *  \sa SDL_Quit()
- */
-
-/* There are no functions directly affecting the quit event */
-
-#define SDL_QuitRequested() \
-        (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0))
-
-#endif /* _SDL_quit_h */
diff --git a/linux-x86/include/SDL2/SDL_rect.h b/linux-x86/include/SDL2/SDL_rect.h
deleted file mode 100644
index 0a95a33..0000000
--- a/linux-x86/include/SDL2/SDL_rect.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_rect.h
- *
- *  Header file for SDL_rect definition and management functions.
- */
-
-#ifndef _SDL_rect_h
-#define _SDL_rect_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_pixels.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \brief  The structure that defines a point
- *
- *  \sa SDL_EnclosePoints
- */
-typedef struct SDL_Point
-{
-    int x;
-    int y;
-} SDL_Point;
-
-/**
- *  \brief A rectangle, with the origin at the upper left.
- *
- *  \sa SDL_RectEmpty
- *  \sa SDL_RectEquals
- *  \sa SDL_HasIntersection
- *  \sa SDL_IntersectRect
- *  \sa SDL_UnionRect
- *  \sa SDL_EnclosePoints
- */
-typedef struct SDL_Rect
-{
-    int x, y;
-    int w, h;
-} SDL_Rect;
-
-/**
- *  \brief Returns true if the rectangle has no area.
- */
-SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r)
-{
-    return ((!r) || (r->w <= 0) || (r->h <= 0)) ? SDL_TRUE : SDL_FALSE;
-}
-
-/**
- *  \brief Returns true if the two rectangles are equal.
- */
-SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b)
-{
-    return (a && b && (a->x == b->x) && (a->y == b->y) &&
-            (a->w == b->w) && (a->h == b->h)) ? SDL_TRUE : SDL_FALSE;
-}
-
-/**
- *  \brief Determine whether two rectangles intersect.
- *
- *  \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A,
-                                                     const SDL_Rect * B);
-
-/**
- *  \brief Calculate the intersection of two rectangles.
- *
- *  \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A,
-                                                   const SDL_Rect * B,
-                                                   SDL_Rect * result);
-
-/**
- *  \brief Calculate the union of two rectangles.
- */
-extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A,
-                                           const SDL_Rect * B,
-                                           SDL_Rect * result);
-
-/**
- *  \brief Calculate a minimal rectangle enclosing a set of points
- *
- *  \return SDL_TRUE if any points were within the clipping rect
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points,
-                                                   int count,
-                                                   const SDL_Rect * clip,
-                                                   SDL_Rect * result);
-
-/**
- *  \brief Calculate the intersection of a rectangle and line segment.
- *
- *  \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect *
-                                                          rect, int *X1,
-                                                          int *Y1, int *X2,
-                                                          int *Y2);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_rect_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_render.h b/linux-x86/include/SDL2/SDL_render.h
deleted file mode 100644
index 77f706a..0000000
--- a/linux-x86/include/SDL2/SDL_render.h
+++ /dev/null
@@ -1,870 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_render.h
- *
- *  Header file for SDL 2D rendering functions.
- *
- *  This API supports the following features:
- *      * single pixel points
- *      * single pixel lines
- *      * filled rectangles
- *      * texture images
- *
- *  The primitives may be drawn in opaque, blended, or additive modes.
- *
- *  The texture images may be drawn in opaque, blended, or additive modes.
- *  They can have an additional color tint or alpha modulation applied to
- *  them, and may also be stretched with linear interpolation.
- *
- *  This API is designed to accelerate simple 2D operations. You may
- *  want more functionality such as polygons and particle effects and
- *  in that case you should use SDL's OpenGL/Direct3D support or one
- *  of the many good 3D engines.
- *
- *  These functions must be called from the main thread.
- *  See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995
- */
-
-#ifndef _SDL_render_h
-#define _SDL_render_h
-
-#include "SDL_stdinc.h"
-#include "SDL_rect.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \brief Flags used when creating a rendering context
- */
-typedef enum
-{
-    SDL_RENDERER_SOFTWARE = 0x00000001,         /**< The renderer is a software fallback */
-    SDL_RENDERER_ACCELERATED = 0x00000002,      /**< The renderer uses hardware
-                                                     acceleration */
-    SDL_RENDERER_PRESENTVSYNC = 0x00000004,     /**< Present is synchronized
-                                                     with the refresh rate */
-    SDL_RENDERER_TARGETTEXTURE = 0x00000008     /**< The renderer supports
-                                                     rendering to texture */
-} SDL_RendererFlags;
-
-/**
- *  \brief Information on the capabilities of a render driver or context.
- */
-typedef struct SDL_RendererInfo
-{
-    const char *name;           /**< The name of the renderer */
-    Uint32 flags;               /**< Supported ::SDL_RendererFlags */
-    Uint32 num_texture_formats; /**< The number of available texture formats */
-    Uint32 texture_formats[16]; /**< The available texture formats */
-    int max_texture_width;      /**< The maximimum texture width */
-    int max_texture_height;     /**< The maximimum texture height */
-} SDL_RendererInfo;
-
-/**
- *  \brief The access pattern allowed for a texture.
- */
-typedef enum
-{
-    SDL_TEXTUREACCESS_STATIC,    /**< Changes rarely, not lockable */
-    SDL_TEXTUREACCESS_STREAMING, /**< Changes frequently, lockable */
-    SDL_TEXTUREACCESS_TARGET     /**< Texture can be used as a render target */
-} SDL_TextureAccess;
-
-/**
- *  \brief The texture channel modulation used in SDL_RenderCopy().
- */
-typedef enum
-{
-    SDL_TEXTUREMODULATE_NONE = 0x00000000,     /**< No modulation */
-    SDL_TEXTUREMODULATE_COLOR = 0x00000001,    /**< srcC = srcC * color */
-    SDL_TEXTUREMODULATE_ALPHA = 0x00000002     /**< srcA = srcA * alpha */
-} SDL_TextureModulate;
-
-/**
- *  \brief Flip constants for SDL_RenderCopyEx
- */
-typedef enum
-{
-    SDL_FLIP_NONE = 0x00000000,     /**< Do not flip */
-    SDL_FLIP_HORIZONTAL = 0x00000001,    /**< flip horizontally */
-    SDL_FLIP_VERTICAL = 0x00000002     /**< flip vertically */
-} SDL_RendererFlip;
-
-/**
- *  \brief A structure representing rendering state
- */
-struct SDL_Renderer;
-typedef struct SDL_Renderer SDL_Renderer;
-
-/**
- *  \brief An efficient driver-specific representation of pixel data
- */
-struct SDL_Texture;
-typedef struct SDL_Texture SDL_Texture;
-
-
-/* Function prototypes */
-
-/**
- *  \brief Get the number of 2D rendering drivers available for the current
- *         display.
- *
- *  A render driver is a set of code that handles rendering and texture
- *  management on a particular display.  Normally there is only one, but
- *  some drivers may have several available with different capabilities.
- *
- *  \sa SDL_GetRenderDriverInfo()
- *  \sa SDL_CreateRenderer()
- */
-extern DECLSPEC int SDLCALL SDL_GetNumRenderDrivers(void);
-
-/**
- *  \brief Get information about a specific 2D rendering driver for the current
- *         display.
- *
- *  \param index The index of the driver to query information about.
- *  \param info  A pointer to an SDL_RendererInfo struct to be filled with
- *               information on the rendering driver.
- *
- *  \return 0 on success, -1 if the index was out of range.
- *
- *  \sa SDL_CreateRenderer()
- */
-extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index,
-                                                    SDL_RendererInfo * info);
-
-/**
- *  \brief Create a window and default renderer
- *
- *  \param width    The width of the window
- *  \param height   The height of the window
- *  \param window_flags The flags used to create the window
- *  \param window   A pointer filled with the window, or NULL on error
- *  \param renderer A pointer filled with the renderer, or NULL on error
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer(
-                                int width, int height, Uint32 window_flags,
-                                SDL_Window **window, SDL_Renderer **renderer);
-
-
-/**
- *  \brief Create a 2D rendering context for a window.
- *
- *  \param window The window where rendering is displayed.
- *  \param index    The index of the rendering driver to initialize, or -1 to
- *                  initialize the first one supporting the requested flags.
- *  \param flags    ::SDL_RendererFlags.
- *
- *  \return A valid rendering context or NULL if there was an error.
- *
- *  \sa SDL_CreateSoftwareRenderer()
- *  \sa SDL_GetRendererInfo()
- *  \sa SDL_DestroyRenderer()
- */
-extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window,
-                                               int index, Uint32 flags);
-
-/**
- *  \brief Create a 2D software rendering context for a surface.
- *
- *  \param surface The surface where rendering is done.
- *
- *  \return A valid rendering context or NULL if there was an error.
- *
- *  \sa SDL_CreateRenderer()
- *  \sa SDL_DestroyRenderer()
- */
-extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface);
-
-/**
- *  \brief Get the renderer associated with a window.
- */
-extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window);
-
-/**
- *  \brief Get information about a rendering context.
- */
-extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer,
-                                                SDL_RendererInfo * info);
-
-/**
- *  \brief Get the output size of a rendering context.
- */
-extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer,
-                                                      int *w, int *h);
-
-/**
- *  \brief Create a texture for a rendering context.
- *
- *  \param renderer The renderer.
- *  \param format The format of the texture.
- *  \param access One of the enumerated values in ::SDL_TextureAccess.
- *  \param w      The width of the texture in pixels.
- *  \param h      The height of the texture in pixels.
- *
- *  \return The created texture is returned, or 0 if no rendering context was
- *          active,  the format was unsupported, or the width or height were out
- *          of range.
- *
- *  \sa SDL_QueryTexture()
- *  \sa SDL_UpdateTexture()
- *  \sa SDL_DestroyTexture()
- */
-extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer,
-                                                        Uint32 format,
-                                                        int access, int w,
-                                                        int h);
-
-/**
- *  \brief Create a texture from an existing surface.
- *
- *  \param renderer The renderer.
- *  \param surface The surface containing pixel data used to fill the texture.
- *
- *  \return The created texture is returned, or 0 on error.
- *
- *  \note The surface is not modified or freed by this function.
- *
- *  \sa SDL_QueryTexture()
- *  \sa SDL_DestroyTexture()
- */
-extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface);
-
-/**
- *  \brief Query the attributes of a texture
- *
- *  \param texture A texture to be queried.
- *  \param format  A pointer filled in with the raw format of the texture.  The
- *                 actual format may differ, but pixel transfers will use this
- *                 format.
- *  \param access  A pointer filled in with the actual access to the texture.
- *  \param w       A pointer filled in with the width of the texture in pixels.
- *  \param h       A pointer filled in with the height of the texture in pixels.
- *
- *  \return 0 on success, or -1 if the texture is not valid.
- */
-extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture,
-                                             Uint32 * format, int *access,
-                                             int *w, int *h);
-
-/**
- *  \brief Set an additional color value used in render copy operations.
- *
- *  \param texture The texture to update.
- *  \param r       The red color value multiplied into copy operations.
- *  \param g       The green color value multiplied into copy operations.
- *  \param b       The blue color value multiplied into copy operations.
- *
- *  \return 0 on success, or -1 if the texture is not valid or color modulation
- *          is not supported.
- *
- *  \sa SDL_GetTextureColorMod()
- */
-extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture,
-                                                   Uint8 r, Uint8 g, Uint8 b);
-
-
-/**
- *  \brief Get the additional color value used in render copy operations.
- *
- *  \param texture The texture to query.
- *  \param r         A pointer filled in with the current red color value.
- *  \param g         A pointer filled in with the current green color value.
- *  \param b         A pointer filled in with the current blue color value.
- *
- *  \return 0 on success, or -1 if the texture is not valid.
- *
- *  \sa SDL_SetTextureColorMod()
- */
-extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture,
-                                                   Uint8 * r, Uint8 * g,
-                                                   Uint8 * b);
-
-/**
- *  \brief Set an additional alpha value used in render copy operations.
- *
- *  \param texture The texture to update.
- *  \param alpha     The alpha value multiplied into copy operations.
- *
- *  \return 0 on success, or -1 if the texture is not valid or alpha modulation
- *          is not supported.
- *
- *  \sa SDL_GetTextureAlphaMod()
- */
-extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture,
-                                                   Uint8 alpha);
-
-/**
- *  \brief Get the additional alpha value used in render copy operations.
- *
- *  \param texture The texture to query.
- *  \param alpha     A pointer filled in with the current alpha value.
- *
- *  \return 0 on success, or -1 if the texture is not valid.
- *
- *  \sa SDL_SetTextureAlphaMod()
- */
-extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture,
-                                                   Uint8 * alpha);
-
-/**
- *  \brief Set the blend mode used for texture copy operations.
- *
- *  \param texture The texture to update.
- *  \param blendMode ::SDL_BlendMode to use for texture blending.
- *
- *  \return 0 on success, or -1 if the texture is not valid or the blend mode is
- *          not supported.
- *
- *  \note If the blend mode is not supported, the closest supported mode is
- *        chosen.
- *
- *  \sa SDL_GetTextureBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture,
-                                                    SDL_BlendMode blendMode);
-
-/**
- *  \brief Get the blend mode used for texture copy operations.
- *
- *  \param texture   The texture to query.
- *  \param blendMode A pointer filled in with the current blend mode.
- *
- *  \return 0 on success, or -1 if the texture is not valid.
- *
- *  \sa SDL_SetTextureBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture,
-                                                    SDL_BlendMode *blendMode);
-
-/**
- *  \brief Update the given texture rectangle with new pixel data.
- *
- *  \param texture   The texture to update
- *  \param rect      A pointer to the rectangle of pixels to update, or NULL to
- *                   update the entire texture.
- *  \param pixels    The raw pixel data.
- *  \param pitch     The number of bytes between rows of pixel data.
- *
- *  \return 0 on success, or -1 if the texture is not valid.
- *
- *  \note This is a fairly slow function.
- */
-extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture,
-                                              const SDL_Rect * rect,
-                                              const void *pixels, int pitch);
-
-/**
- *  \brief Update a rectangle within a planar YV12 or IYUV texture with new pixel data.
- *
- *  \param texture   The texture to update
- *  \param rect      A pointer to the rectangle of pixels to update, or NULL to
- *                   update the entire texture.
- *  \param Yplane    The raw pixel data for the Y plane.
- *  \param Ypitch    The number of bytes between rows of pixel data for the Y plane.
- *  \param Uplane    The raw pixel data for the U plane.
- *  \param Upitch    The number of bytes between rows of pixel data for the U plane.
- *  \param Vplane    The raw pixel data for the V plane.
- *  \param Vpitch    The number of bytes between rows of pixel data for the V plane.
- *
- *  \return 0 on success, or -1 if the texture is not valid.
- *
- *  \note You can use SDL_UpdateTexture() as long as your pixel data is
- *        a contiguous block of Y and U/V planes in the proper order, but
- *        this function is available if your pixel data is not contiguous.
- */
-extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture,
-                                                 const SDL_Rect * rect,
-                                                 const Uint8 *Yplane, int Ypitch,
-                                                 const Uint8 *Uplane, int Upitch,
-                                                 const Uint8 *Vplane, int Vpitch);
-
-/**
- *  \brief Lock a portion of the texture for write-only pixel access.
- *
- *  \param texture   The texture to lock for access, which was created with
- *                   ::SDL_TEXTUREACCESS_STREAMING.
- *  \param rect      A pointer to the rectangle to lock for access. If the rect
- *                   is NULL, the entire texture will be locked.
- *  \param pixels    This is filled in with a pointer to the locked pixels,
- *                   appropriately offset by the locked area.
- *  \param pitch     This is filled in with the pitch of the locked pixels.
- *
- *  \return 0 on success, or -1 if the texture is not valid or was not created with ::SDL_TEXTUREACCESS_STREAMING.
- *
- *  \sa SDL_UnlockTexture()
- */
-extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture,
-                                            const SDL_Rect * rect,
-                                            void **pixels, int *pitch);
-
-/**
- *  \brief Unlock a texture, uploading the changes to video memory, if needed.
- *
- *  \sa SDL_LockTexture()
- */
-extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture);
-
-/**
- * \brief Determines whether a window supports the use of render targets
- *
- * \param renderer The renderer that will be checked
- *
- * \return SDL_TRUE if supported, SDL_FALSE if not.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer);
-
-/**
- * \brief Set a texture as the current rendering target.
- *
- * \param renderer The renderer.
- * \param texture The targeted texture, which must be created with the SDL_TEXTUREACCESS_TARGET flag, or NULL for the default render target
- *
- * \return 0 on success, or -1 on error
- *
- *  \sa SDL_GetRenderTarget()
- */
-extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer,
-                                                SDL_Texture *texture);
-
-/**
- * \brief Get the current render target or NULL for the default render target.
- *
- * \return The current render target
- *
- *  \sa SDL_SetRenderTarget()
- */
-extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer);
-
-/**
- *  \brief Set device independent resolution for rendering
- *
- *  \param renderer The renderer for which resolution should be set.
- *  \param w      The width of the logical resolution
- *  \param h      The height of the logical resolution
- *
- *  This function uses the viewport and scaling functionality to allow a fixed logical
- *  resolution for rendering, regardless of the actual output resolution.  If the actual
- *  output resolution doesn't have the same aspect ratio the output rendering will be
- *  centered within the output display.
- *
- *  If the output display is a window, mouse events in the window will be filtered
- *  and scaled so they seem to arrive within the logical resolution.
- *
- *  \note If this function results in scaling or subpixel drawing by the
- *        rendering backend, it will be handled using the appropriate
- *        quality hints.
- *
- *  \sa SDL_RenderGetLogicalSize()
- *  \sa SDL_RenderSetScale()
- *  \sa SDL_RenderSetViewport()
- */
-extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h);
-
-/**
- *  \brief Get device independent resolution for rendering
- *
- *  \param renderer The renderer from which resolution should be queried.
- *  \param w      A pointer filled with the width of the logical resolution
- *  \param h      A pointer filled with the height of the logical resolution
- *
- *  \sa SDL_RenderSetLogicalSize()
- */
-extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h);
-
-/**
- *  \brief Set the drawing area for rendering on the current target.
- *
- *  \param renderer The renderer for which the drawing area should be set.
- *  \param rect The rectangle representing the drawing area, or NULL to set the viewport to the entire target.
- *
- *  The x,y of the viewport rect represents the origin for rendering.
- *
- *  \return 0 on success, or -1 on error
- *
- *  \note If the window associated with the renderer is resized, the viewport is automatically reset.
- *
- *  \sa SDL_RenderGetViewport()
- *  \sa SDL_RenderSetLogicalSize()
- */
-extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer,
-                                                  const SDL_Rect * rect);
-
-/**
- *  \brief Get the drawing area for the current target.
- *
- *  \sa SDL_RenderSetViewport()
- */
-extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer,
-                                                   SDL_Rect * rect);
-
-/**
- *  \brief Set the clip rectangle for the current target.
- *
- *  \param renderer The renderer for which clip rectangle should be set.
- *  \param rect   A pointer to the rectangle to set as the clip rectangle, or
- *                NULL to disable clipping.
- *
- *  \return 0 on success, or -1 on error
- *
- *  \sa SDL_RenderGetClipRect()
- */
-extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer,
-                                                  const SDL_Rect * rect);
-
-/**
- *  \brief Get the clip rectangle for the current target.
- *
- *  \param renderer The renderer from which clip rectangle should be queried.
- *  \param rect   A pointer filled in with the current clip rectangle, or
- *                an empty rectangle if clipping is disabled.
- *
- *  \sa SDL_RenderSetClipRect()
- */
-extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer,
-                                                   SDL_Rect * rect);
-
-/**
- *  \brief Set the drawing scale for rendering on the current target.
- *
- *  \param renderer The renderer for which the drawing scale should be set.
- *  \param scaleX The horizontal scaling factor
- *  \param scaleY The vertical scaling factor
- *
- *  The drawing coordinates are scaled by the x/y scaling factors
- *  before they are used by the renderer.  This allows resolution
- *  independent drawing with a single coordinate system.
- *
- *  \note If this results in scaling or subpixel drawing by the
- *        rendering backend, it will be handled using the appropriate
- *        quality hints.  For best results use integer scaling factors.
- *
- *  \sa SDL_RenderGetScale()
- *  \sa SDL_RenderSetLogicalSize()
- */
-extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer,
-                                               float scaleX, float scaleY);
-
-/**
- *  \brief Get the drawing scale for the current target.
- *
- *  \param renderer The renderer from which drawing scale should be queried.
- *  \param scaleX A pointer filled in with the horizontal scaling factor
- *  \param scaleY A pointer filled in with the vertical scaling factor
- *
- *  \sa SDL_RenderSetScale()
- */
-extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer,
-                                               float *scaleX, float *scaleY);
-
-/**
- *  \brief Set the color used for drawing operations (Rect, Line and Clear).
- *
- *  \param renderer The renderer for which drawing color should be set.
- *  \param r The red value used to draw on the rendering target.
- *  \param g The green value used to draw on the rendering target.
- *  \param b The blue value used to draw on the rendering target.
- *  \param a The alpha value used to draw on the rendering target, usually
- *           ::SDL_ALPHA_OPAQUE (255).
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer,
-                                           Uint8 r, Uint8 g, Uint8 b,
-                                           Uint8 a);
-
-/**
- *  \brief Get the color used for drawing operations (Rect, Line and Clear).
- *
- *  \param renderer The renderer from which drawing color should be queried.
- *  \param r A pointer to the red value used to draw on the rendering target.
- *  \param g A pointer to the green value used to draw on the rendering target.
- *  \param b A pointer to the blue value used to draw on the rendering target.
- *  \param a A pointer to the alpha value used to draw on the rendering target,
- *           usually ::SDL_ALPHA_OPAQUE (255).
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer,
-                                           Uint8 * r, Uint8 * g, Uint8 * b,
-                                           Uint8 * a);
-
-/**
- *  \brief Set the blend mode used for drawing operations (Fill and Line).
- *
- *  \param renderer The renderer for which blend mode should be set.
- *  \param blendMode ::SDL_BlendMode to use for blending.
- *
- *  \return 0 on success, or -1 on error
- *
- *  \note If the blend mode is not supported, the closest supported mode is
- *        chosen.
- *
- *  \sa SDL_GetRenderDrawBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer,
-                                                       SDL_BlendMode blendMode);
-
-/**
- *  \brief Get the blend mode used for drawing operations.
- *
- *  \param renderer The renderer from which blend mode should be queried.
- *  \param blendMode A pointer filled in with the current blend mode.
- *
- *  \return 0 on success, or -1 on error
- *
- *  \sa SDL_SetRenderDrawBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer,
-                                                       SDL_BlendMode *blendMode);
-
-/**
- *  \brief Clear the current rendering target with the drawing color
- *
- *  This function clears the entire rendering target, ignoring the viewport.
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer);
-
-/**
- *  \brief Draw a point on the current rendering target.
- *
- *  \param renderer The renderer which should draw a point.
- *  \param x The x coordinate of the point.
- *  \param y The y coordinate of the point.
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer,
-                                                int x, int y);
-
-/**
- *  \brief Draw multiple points on the current rendering target.
- *
- *  \param renderer The renderer which should draw multiple points.
- *  \param points The points to draw
- *  \param count The number of points to draw
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderDrawPoints(SDL_Renderer * renderer,
-                                                 const SDL_Point * points,
-                                                 int count);
-
-/**
- *  \brief Draw a line on the current rendering target.
- *
- *  \param renderer The renderer which should draw a line.
- *  \param x1 The x coordinate of the start point.
- *  \param y1 The y coordinate of the start point.
- *  \param x2 The x coordinate of the end point.
- *  \param y2 The y coordinate of the end point.
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderDrawLine(SDL_Renderer * renderer,
-                                               int x1, int y1, int x2, int y2);
-
-/**
- *  \brief Draw a series of connected lines on the current rendering target.
- *
- *  \param renderer The renderer which should draw multiple lines.
- *  \param points The points along the lines
- *  \param count The number of points, drawing count-1 lines
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderDrawLines(SDL_Renderer * renderer,
-                                                const SDL_Point * points,
-                                                int count);
-
-/**
- *  \brief Draw a rectangle on the current rendering target.
- *
- *  \param renderer The renderer which should draw a rectangle.
- *  \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target.
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderDrawRect(SDL_Renderer * renderer,
-                                               const SDL_Rect * rect);
-
-/**
- *  \brief Draw some number of rectangles on the current rendering target.
- *
- *  \param renderer The renderer which should draw multiple rectangles.
- *  \param rects A pointer to an array of destination rectangles.
- *  \param count The number of rectangles.
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderDrawRects(SDL_Renderer * renderer,
-                                                const SDL_Rect * rects,
-                                                int count);
-
-/**
- *  \brief Fill a rectangle on the current rendering target with the drawing color.
- *
- *  \param renderer The renderer which should fill a rectangle.
- *  \param rect A pointer to the destination rectangle, or NULL for the entire
- *              rendering target.
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderFillRect(SDL_Renderer * renderer,
-                                               const SDL_Rect * rect);
-
-/**
- *  \brief Fill some number of rectangles on the current rendering target with the drawing color.
- *
- *  \param renderer The renderer which should fill multiple rectangles.
- *  \param rects A pointer to an array of destination rectangles.
- *  \param count The number of rectangles.
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderFillRects(SDL_Renderer * renderer,
-                                                const SDL_Rect * rects,
-                                                int count);
-
-/**
- *  \brief Copy a portion of the texture to the current rendering target.
- *
- *  \param renderer The renderer which should copy parts of a texture.
- *  \param texture The source texture.
- *  \param srcrect   A pointer to the source rectangle, or NULL for the entire
- *                   texture.
- *  \param dstrect   A pointer to the destination rectangle, or NULL for the
- *                   entire rendering target.
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer,
-                                           SDL_Texture * texture,
-                                           const SDL_Rect * srcrect,
-                                           const SDL_Rect * dstrect);
-
-/**
- *  \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center
- *
- *  \param renderer The renderer which should copy parts of a texture.
- *  \param texture The source texture.
- *  \param srcrect   A pointer to the source rectangle, or NULL for the entire
- *                   texture.
- *  \param dstrect   A pointer to the destination rectangle, or NULL for the
- *                   entire rendering target.
- *  \param angle    An angle in degrees that indicates the rotation that will be applied to dstrect
- *  \param center   A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done aroud dstrect.w/2, dstrect.h/2)
- *  \param flip     An SDL_RendererFlip value stating which flipping actions should be performed on the texture
- *
- *  \return 0 on success, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer,
-                                           SDL_Texture * texture,
-                                           const SDL_Rect * srcrect,
-                                           const SDL_Rect * dstrect,
-                                           const double angle,
-                                           const SDL_Point *center,
-                                           const SDL_RendererFlip flip);
-
-/**
- *  \brief Read pixels from the current rendering target.
- *
- *  \param renderer The renderer from which pixels should be read.
- *  \param rect   A pointer to the rectangle to read, or NULL for the entire
- *                render target.
- *  \param format The desired format of the pixel data, or 0 to use the format
- *                of the rendering target
- *  \param pixels A pointer to be filled in with the pixel data
- *  \param pitch  The pitch of the pixels parameter.
- *
- *  \return 0 on success, or -1 if pixel reading is not supported.
- *
- *  \warning This is a very slow operation, and should not be used frequently.
- */
-extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer,
-                                                 const SDL_Rect * rect,
-                                                 Uint32 format,
-                                                 void *pixels, int pitch);
-
-/**
- *  \brief Update the screen with rendering performed.
- */
-extern DECLSPEC void SDLCALL SDL_RenderPresent(SDL_Renderer * renderer);
-
-/**
- *  \brief Destroy the specified texture.
- *
- *  \sa SDL_CreateTexture()
- *  \sa SDL_CreateTextureFromSurface()
- */
-extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_Texture * texture);
-
-/**
- *  \brief Destroy the rendering context for a window and free associated
- *         textures.
- *
- *  \sa SDL_CreateRenderer()
- */
-extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_Renderer * renderer);
-
-
-/**
- *  \brief Bind the texture to the current OpenGL/ES/ES2 context for use with
- *         OpenGL instructions.
- *
- *  \param texture  The SDL texture to bind
- *  \param texw     A pointer to a float that will be filled with the texture width
- *  \param texh     A pointer to a float that will be filled with the texture height
- *
- *  \return 0 on success, or -1 if the operation is not supported
- */
-extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh);
-
-/**
- *  \brief Unbind a texture from the current OpenGL/ES/ES2 context.
- *
- *  \param texture  The SDL texture to unbind
- *
- *  \return 0 on success, or -1 if the operation is not supported
- */
-extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_render_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_revision.h b/linux-x86/include/SDL2/SDL_revision.h
deleted file mode 100644
index a75dc33..0000000
--- a/linux-x86/include/SDL2/SDL_revision.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SDL_REVISION "hg-8628:b558f99d48f0"
-#define SDL_REVISION_NUMBER 8628
diff --git a/linux-x86/include/SDL2/SDL_rwops.h b/linux-x86/include/SDL2/SDL_rwops.h
deleted file mode 100644
index 4bdd787..0000000
--- a/linux-x86/include/SDL2/SDL_rwops.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_rwops.h
- *
- *  This file provides a general interface for SDL to read and write
- *  data streams.  It can easily be extended to files, memory, etc.
- */
-
-#ifndef _SDL_rwops_h
-#define _SDL_rwops_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* RWops Types */
-#define SDL_RWOPS_UNKNOWN   0   /* Unknown stream type */
-#define SDL_RWOPS_WINFILE   1   /* Win32 file */
-#define SDL_RWOPS_STDFILE   2   /* Stdio file */
-#define SDL_RWOPS_JNIFILE   3   /* Android asset */
-#define SDL_RWOPS_MEMORY    4   /* Memory stream */
-#define SDL_RWOPS_MEMORY_RO 5   /* Read-Only memory stream */
-
-/**
- * This is the read/write operation structure -- very basic.
- */
-typedef struct SDL_RWops
-{
-    /**
-     *  Return the size of the file in this rwops, or -1 if unknown
-     */
-    Sint64 (SDLCALL * size) (struct SDL_RWops * context);
-
-    /**
-     *  Seek to \c offset relative to \c whence, one of stdio's whence values:
-     *  RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END
-     *
-     *  \return the final offset in the data stream, or -1 on error.
-     */
-    Sint64 (SDLCALL * seek) (struct SDL_RWops * context, Sint64 offset,
-                             int whence);
-
-    /**
-     *  Read up to \c maxnum objects each of size \c size from the data
-     *  stream to the area pointed at by \c ptr.
-     *
-     *  \return the number of objects read, or 0 at error or end of file.
-     */
-    size_t (SDLCALL * read) (struct SDL_RWops * context, void *ptr,
-                             size_t size, size_t maxnum);
-
-    /**
-     *  Write exactly \c num objects each of size \c size from the area
-     *  pointed at by \c ptr to data stream.
-     *
-     *  \return the number of objects written, or 0 at error or end of file.
-     */
-    size_t (SDLCALL * write) (struct SDL_RWops * context, const void *ptr,
-                              size_t size, size_t num);
-
-    /**
-     *  Close and free an allocated SDL_RWops structure.
-     *
-     *  \return 0 if successful or -1 on write error when flushing data.
-     */
-    int (SDLCALL * close) (struct SDL_RWops * context);
-
-    Uint32 type;
-    union
-    {
-#if defined(ANDROID)
-        struct
-        {
-            void *fileNameRef;
-            void *inputStreamRef;
-            void *readableByteChannelRef;
-            void *readMethod;
-            void *assetFileDescriptorRef;
-            long position;
-            long size;
-            long offset;
-            int fd;
-        } androidio;
-#elif defined(__WIN32__)
-        struct
-        {
-            SDL_bool append;
-            void *h;
-            struct
-            {
-                void *data;
-                size_t size;
-                size_t left;
-            } buffer;
-        } windowsio;
-#endif
-
-#ifdef HAVE_STDIO_H
-        struct
-        {
-            SDL_bool autoclose;
-            FILE *fp;
-        } stdio;
-#endif
-        struct
-        {
-            Uint8 *base;
-            Uint8 *here;
-            Uint8 *stop;
-        } mem;
-        struct
-        {
-            void *data1;
-            void *data2;
-        } unknown;
-    } hidden;
-
-} SDL_RWops;
-
-
-/**
- *  \name RWFrom functions
- *
- *  Functions to create SDL_RWops structures from various data streams.
- */
-/* @{ */
-
-extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file,
-                                                  const char *mode);
-
-#ifdef HAVE_STDIO_H
-extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp,
-                                                SDL_bool autoclose);
-#else
-extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(void * fp,
-                                                SDL_bool autoclose);
-#endif
-
-extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size);
-extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem,
-                                                      int size);
-
-/* @} *//* RWFrom functions */
-
-
-extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void);
-extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area);
-
-#define RW_SEEK_SET 0       /**< Seek from the beginning of data */
-#define RW_SEEK_CUR 1       /**< Seek relative to current read point */
-#define RW_SEEK_END 2       /**< Seek relative to the end of data */
-
-/**
- *  \name Read/write macros
- *
- *  Macros to easily read and write from an SDL_RWops structure.
- */
-/* @{ */
-#define SDL_RWsize(ctx)         (ctx)->size(ctx)
-#define SDL_RWseek(ctx, offset, whence) (ctx)->seek(ctx, offset, whence)
-#define SDL_RWtell(ctx)         (ctx)->seek(ctx, 0, RW_SEEK_CUR)
-#define SDL_RWread(ctx, ptr, size, n)   (ctx)->read(ctx, ptr, size, n)
-#define SDL_RWwrite(ctx, ptr, size, n)  (ctx)->write(ctx, ptr, size, n)
-#define SDL_RWclose(ctx)        (ctx)->close(ctx)
-/* @} *//* Read/write macros */
-
-
-/**
- *  \name Read endian functions
- *
- *  Read an item of the specified endianness and return in native format.
- */
-/* @{ */
-extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src);
-extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src);
-extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src);
-extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src);
-extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src);
-extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src);
-extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src);
-/* @} *//* Read endian functions */
-
-/**
- *  \name Write endian functions
- *
- *  Write an item of native format to the specified endianness.
- */
-/* @{ */
-extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value);
-extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value);
-extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value);
-extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value);
-extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value);
-extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value);
-extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
-/* @} *//* Write endian functions */
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_rwops_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_scancode.h b/linux-x86/include/SDL2/SDL_scancode.h
deleted file mode 100644
index 4b3be28..0000000
--- a/linux-x86/include/SDL2/SDL_scancode.h
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_scancode.h
- *
- *  Defines keyboard scancodes.
- */
-
-#ifndef _SDL_scancode_h
-#define _SDL_scancode_h
-
-#include "SDL_stdinc.h"
-
-/**
- *  \brief The SDL keyboard scancode representation.
- *
- *  Values of this type are used to represent keyboard keys, among other places
- *  in the \link SDL_Keysym::scancode key.keysym.scancode \endlink field of the
- *  SDL_Event structure.
- *
- *  The values in this enumeration are based on the USB usage page standard:
- *  http://www.usb.org/developers/devclass_docs/Hut1_12v2.pdf
- */
-typedef enum
-{
-    SDL_SCANCODE_UNKNOWN = 0,
-
-    /**
-     *  \name Usage page 0x07
-     *
-     *  These values are from usage page 0x07 (USB keyboard page).
-     */
-    /* @{ */
-
-    SDL_SCANCODE_A = 4,
-    SDL_SCANCODE_B = 5,
-    SDL_SCANCODE_C = 6,
-    SDL_SCANCODE_D = 7,
-    SDL_SCANCODE_E = 8,
-    SDL_SCANCODE_F = 9,
-    SDL_SCANCODE_G = 10,
-    SDL_SCANCODE_H = 11,
-    SDL_SCANCODE_I = 12,
-    SDL_SCANCODE_J = 13,
-    SDL_SCANCODE_K = 14,
-    SDL_SCANCODE_L = 15,
-    SDL_SCANCODE_M = 16,
-    SDL_SCANCODE_N = 17,
-    SDL_SCANCODE_O = 18,
-    SDL_SCANCODE_P = 19,
-    SDL_SCANCODE_Q = 20,
-    SDL_SCANCODE_R = 21,
-    SDL_SCANCODE_S = 22,
-    SDL_SCANCODE_T = 23,
-    SDL_SCANCODE_U = 24,
-    SDL_SCANCODE_V = 25,
-    SDL_SCANCODE_W = 26,
-    SDL_SCANCODE_X = 27,
-    SDL_SCANCODE_Y = 28,
-    SDL_SCANCODE_Z = 29,
-
-    SDL_SCANCODE_1 = 30,
-    SDL_SCANCODE_2 = 31,
-    SDL_SCANCODE_3 = 32,
-    SDL_SCANCODE_4 = 33,
-    SDL_SCANCODE_5 = 34,
-    SDL_SCANCODE_6 = 35,
-    SDL_SCANCODE_7 = 36,
-    SDL_SCANCODE_8 = 37,
-    SDL_SCANCODE_9 = 38,
-    SDL_SCANCODE_0 = 39,
-
-    SDL_SCANCODE_RETURN = 40,
-    SDL_SCANCODE_ESCAPE = 41,
-    SDL_SCANCODE_BACKSPACE = 42,
-    SDL_SCANCODE_TAB = 43,
-    SDL_SCANCODE_SPACE = 44,
-
-    SDL_SCANCODE_MINUS = 45,
-    SDL_SCANCODE_EQUALS = 46,
-    SDL_SCANCODE_LEFTBRACKET = 47,
-    SDL_SCANCODE_RIGHTBRACKET = 48,
-    SDL_SCANCODE_BACKSLASH = 49, /**< Located at the lower left of the return
-                                  *   key on ISO keyboards and at the right end
-                                  *   of the QWERTY row on ANSI keyboards.
-                                  *   Produces REVERSE SOLIDUS (backslash) and
-                                  *   VERTICAL LINE in a US layout, REVERSE
-                                  *   SOLIDUS and VERTICAL LINE in a UK Mac
-                                  *   layout, NUMBER SIGN and TILDE in a UK
-                                  *   Windows layout, DOLLAR SIGN and POUND SIGN
-                                  *   in a Swiss German layout, NUMBER SIGN and
-                                  *   APOSTROPHE in a German layout, GRAVE
-                                  *   ACCENT and POUND SIGN in a French Mac
-                                  *   layout, and ASTERISK and MICRO SIGN in a
-                                  *   French Windows layout.
-                                  */
-    SDL_SCANCODE_NONUSHASH = 50, /**< ISO USB keyboards actually use this code
-                                  *   instead of 49 for the same key, but all
-                                  *   OSes I've seen treat the two codes
-                                  *   identically. So, as an implementor, unless
-                                  *   your keyboard generates both of those
-                                  *   codes and your OS treats them differently,
-                                  *   you should generate SDL_SCANCODE_BACKSLASH
-                                  *   instead of this code. As a user, you
-                                  *   should not rely on this code because SDL
-                                  *   will never generate it with most (all?)
-                                  *   keyboards.
-                                  */
-    SDL_SCANCODE_SEMICOLON = 51,
-    SDL_SCANCODE_APOSTROPHE = 52,
-    SDL_SCANCODE_GRAVE = 53, /**< Located in the top left corner (on both ANSI
-                              *   and ISO keyboards). Produces GRAVE ACCENT and
-                              *   TILDE in a US Windows layout and in US and UK
-                              *   Mac layouts on ANSI keyboards, GRAVE ACCENT
-                              *   and NOT SIGN in a UK Windows layout, SECTION
-                              *   SIGN and PLUS-MINUS SIGN in US and UK Mac
-                              *   layouts on ISO keyboards, SECTION SIGN and
-                              *   DEGREE SIGN in a Swiss German layout (Mac:
-                              *   only on ISO keyboards), CIRCUMFLEX ACCENT and
-                              *   DEGREE SIGN in a German layout (Mac: only on
-                              *   ISO keyboards), SUPERSCRIPT TWO and TILDE in a
-                              *   French Windows layout, COMMERCIAL AT and
-                              *   NUMBER SIGN in a French Mac layout on ISO
-                              *   keyboards, and LESS-THAN SIGN and GREATER-THAN
-                              *   SIGN in a Swiss German, German, or French Mac
-                              *   layout on ANSI keyboards.
-                              */
-    SDL_SCANCODE_COMMA = 54,
-    SDL_SCANCODE_PERIOD = 55,
-    SDL_SCANCODE_SLASH = 56,
-
-    SDL_SCANCODE_CAPSLOCK = 57,
-
-    SDL_SCANCODE_F1 = 58,
-    SDL_SCANCODE_F2 = 59,
-    SDL_SCANCODE_F3 = 60,
-    SDL_SCANCODE_F4 = 61,
-    SDL_SCANCODE_F5 = 62,
-    SDL_SCANCODE_F6 = 63,
-    SDL_SCANCODE_F7 = 64,
-    SDL_SCANCODE_F8 = 65,
-    SDL_SCANCODE_F9 = 66,
-    SDL_SCANCODE_F10 = 67,
-    SDL_SCANCODE_F11 = 68,
-    SDL_SCANCODE_F12 = 69,
-
-    SDL_SCANCODE_PRINTSCREEN = 70,
-    SDL_SCANCODE_SCROLLLOCK = 71,
-    SDL_SCANCODE_PAUSE = 72,
-    SDL_SCANCODE_INSERT = 73, /**< insert on PC, help on some Mac keyboards (but
-                                   does send code 73, not 117) */
-    SDL_SCANCODE_HOME = 74,
-    SDL_SCANCODE_PAGEUP = 75,
-    SDL_SCANCODE_DELETE = 76,
-    SDL_SCANCODE_END = 77,
-    SDL_SCANCODE_PAGEDOWN = 78,
-    SDL_SCANCODE_RIGHT = 79,
-    SDL_SCANCODE_LEFT = 80,
-    SDL_SCANCODE_DOWN = 81,
-    SDL_SCANCODE_UP = 82,
-
-    SDL_SCANCODE_NUMLOCKCLEAR = 83, /**< num lock on PC, clear on Mac keyboards
-                                     */
-    SDL_SCANCODE_KP_DIVIDE = 84,
-    SDL_SCANCODE_KP_MULTIPLY = 85,
-    SDL_SCANCODE_KP_MINUS = 86,
-    SDL_SCANCODE_KP_PLUS = 87,
-    SDL_SCANCODE_KP_ENTER = 88,
-    SDL_SCANCODE_KP_1 = 89,
-    SDL_SCANCODE_KP_2 = 90,
-    SDL_SCANCODE_KP_3 = 91,
-    SDL_SCANCODE_KP_4 = 92,
-    SDL_SCANCODE_KP_5 = 93,
-    SDL_SCANCODE_KP_6 = 94,
-    SDL_SCANCODE_KP_7 = 95,
-    SDL_SCANCODE_KP_8 = 96,
-    SDL_SCANCODE_KP_9 = 97,
-    SDL_SCANCODE_KP_0 = 98,
-    SDL_SCANCODE_KP_PERIOD = 99,
-
-    SDL_SCANCODE_NONUSBACKSLASH = 100, /**< This is the additional key that ISO
-                                        *   keyboards have over ANSI ones,
-                                        *   located between left shift and Y.
-                                        *   Produces GRAVE ACCENT and TILDE in a
-                                        *   US or UK Mac layout, REVERSE SOLIDUS
-                                        *   (backslash) and VERTICAL LINE in a
-                                        *   US or UK Windows layout, and
-                                        *   LESS-THAN SIGN and GREATER-THAN SIGN
-                                        *   in a Swiss German, German, or French
-                                        *   layout. */
-    SDL_SCANCODE_APPLICATION = 101, /**< windows contextual menu, compose */
-    SDL_SCANCODE_POWER = 102, /**< The USB document says this is a status flag,
-                               *   not a physical key - but some Mac keyboards
-                               *   do have a power key. */
-    SDL_SCANCODE_KP_EQUALS = 103,
-    SDL_SCANCODE_F13 = 104,
-    SDL_SCANCODE_F14 = 105,
-    SDL_SCANCODE_F15 = 106,
-    SDL_SCANCODE_F16 = 107,
-    SDL_SCANCODE_F17 = 108,
-    SDL_SCANCODE_F18 = 109,
-    SDL_SCANCODE_F19 = 110,
-    SDL_SCANCODE_F20 = 111,
-    SDL_SCANCODE_F21 = 112,
-    SDL_SCANCODE_F22 = 113,
-    SDL_SCANCODE_F23 = 114,
-    SDL_SCANCODE_F24 = 115,
-    SDL_SCANCODE_EXECUTE = 116,
-    SDL_SCANCODE_HELP = 117,
-    SDL_SCANCODE_MENU = 118,
-    SDL_SCANCODE_SELECT = 119,
-    SDL_SCANCODE_STOP = 120,
-    SDL_SCANCODE_AGAIN = 121,   /**< redo */
-    SDL_SCANCODE_UNDO = 122,
-    SDL_SCANCODE_CUT = 123,
-    SDL_SCANCODE_COPY = 124,
-    SDL_SCANCODE_PASTE = 125,
-    SDL_SCANCODE_FIND = 126,
-    SDL_SCANCODE_MUTE = 127,
-    SDL_SCANCODE_VOLUMEUP = 128,
-    SDL_SCANCODE_VOLUMEDOWN = 129,
-/* not sure whether there's a reason to enable these */
-/*     SDL_SCANCODE_LOCKINGCAPSLOCK = 130,  */
-/*     SDL_SCANCODE_LOCKINGNUMLOCK = 131, */
-/*     SDL_SCANCODE_LOCKINGSCROLLLOCK = 132, */
-    SDL_SCANCODE_KP_COMMA = 133,
-    SDL_SCANCODE_KP_EQUALSAS400 = 134,
-
-    SDL_SCANCODE_INTERNATIONAL1 = 135, /**< used on Asian keyboards, see
-                                            footnotes in USB doc */
-    SDL_SCANCODE_INTERNATIONAL2 = 136,
-    SDL_SCANCODE_INTERNATIONAL3 = 137, /**< Yen */
-    SDL_SCANCODE_INTERNATIONAL4 = 138,
-    SDL_SCANCODE_INTERNATIONAL5 = 139,
-    SDL_SCANCODE_INTERNATIONAL6 = 140,
-    SDL_SCANCODE_INTERNATIONAL7 = 141,
-    SDL_SCANCODE_INTERNATIONAL8 = 142,
-    SDL_SCANCODE_INTERNATIONAL9 = 143,
-    SDL_SCANCODE_LANG1 = 144, /**< Hangul/English toggle */
-    SDL_SCANCODE_LANG2 = 145, /**< Hanja conversion */
-    SDL_SCANCODE_LANG3 = 146, /**< Katakana */
-    SDL_SCANCODE_LANG4 = 147, /**< Hiragana */
-    SDL_SCANCODE_LANG5 = 148, /**< Zenkaku/Hankaku */
-    SDL_SCANCODE_LANG6 = 149, /**< reserved */
-    SDL_SCANCODE_LANG7 = 150, /**< reserved */
-    SDL_SCANCODE_LANG8 = 151, /**< reserved */
-    SDL_SCANCODE_LANG9 = 152, /**< reserved */
-
-    SDL_SCANCODE_ALTERASE = 153, /**< Erase-Eaze */
-    SDL_SCANCODE_SYSREQ = 154,
-    SDL_SCANCODE_CANCEL = 155,
-    SDL_SCANCODE_CLEAR = 156,
-    SDL_SCANCODE_PRIOR = 157,
-    SDL_SCANCODE_RETURN2 = 158,
-    SDL_SCANCODE_SEPARATOR = 159,
-    SDL_SCANCODE_OUT = 160,
-    SDL_SCANCODE_OPER = 161,
-    SDL_SCANCODE_CLEARAGAIN = 162,
-    SDL_SCANCODE_CRSEL = 163,
-    SDL_SCANCODE_EXSEL = 164,
-
-    SDL_SCANCODE_KP_00 = 176,
-    SDL_SCANCODE_KP_000 = 177,
-    SDL_SCANCODE_THOUSANDSSEPARATOR = 178,
-    SDL_SCANCODE_DECIMALSEPARATOR = 179,
-    SDL_SCANCODE_CURRENCYUNIT = 180,
-    SDL_SCANCODE_CURRENCYSUBUNIT = 181,
-    SDL_SCANCODE_KP_LEFTPAREN = 182,
-    SDL_SCANCODE_KP_RIGHTPAREN = 183,
-    SDL_SCANCODE_KP_LEFTBRACE = 184,
-    SDL_SCANCODE_KP_RIGHTBRACE = 185,
-    SDL_SCANCODE_KP_TAB = 186,
-    SDL_SCANCODE_KP_BACKSPACE = 187,
-    SDL_SCANCODE_KP_A = 188,
-    SDL_SCANCODE_KP_B = 189,
-    SDL_SCANCODE_KP_C = 190,
-    SDL_SCANCODE_KP_D = 191,
-    SDL_SCANCODE_KP_E = 192,
-    SDL_SCANCODE_KP_F = 193,
-    SDL_SCANCODE_KP_XOR = 194,
-    SDL_SCANCODE_KP_POWER = 195,
-    SDL_SCANCODE_KP_PERCENT = 196,
-    SDL_SCANCODE_KP_LESS = 197,
-    SDL_SCANCODE_KP_GREATER = 198,
-    SDL_SCANCODE_KP_AMPERSAND = 199,
-    SDL_SCANCODE_KP_DBLAMPERSAND = 200,
-    SDL_SCANCODE_KP_VERTICALBAR = 201,
-    SDL_SCANCODE_KP_DBLVERTICALBAR = 202,
-    SDL_SCANCODE_KP_COLON = 203,
-    SDL_SCANCODE_KP_HASH = 204,
-    SDL_SCANCODE_KP_SPACE = 205,
-    SDL_SCANCODE_KP_AT = 206,
-    SDL_SCANCODE_KP_EXCLAM = 207,
-    SDL_SCANCODE_KP_MEMSTORE = 208,
-    SDL_SCANCODE_KP_MEMRECALL = 209,
-    SDL_SCANCODE_KP_MEMCLEAR = 210,
-    SDL_SCANCODE_KP_MEMADD = 211,
-    SDL_SCANCODE_KP_MEMSUBTRACT = 212,
-    SDL_SCANCODE_KP_MEMMULTIPLY = 213,
-    SDL_SCANCODE_KP_MEMDIVIDE = 214,
-    SDL_SCANCODE_KP_PLUSMINUS = 215,
-    SDL_SCANCODE_KP_CLEAR = 216,
-    SDL_SCANCODE_KP_CLEARENTRY = 217,
-    SDL_SCANCODE_KP_BINARY = 218,
-    SDL_SCANCODE_KP_OCTAL = 219,
-    SDL_SCANCODE_KP_DECIMAL = 220,
-    SDL_SCANCODE_KP_HEXADECIMAL = 221,
-
-    SDL_SCANCODE_LCTRL = 224,
-    SDL_SCANCODE_LSHIFT = 225,
-    SDL_SCANCODE_LALT = 226, /**< alt, option */
-    SDL_SCANCODE_LGUI = 227, /**< windows, command (apple), meta */
-    SDL_SCANCODE_RCTRL = 228,
-    SDL_SCANCODE_RSHIFT = 229,
-    SDL_SCANCODE_RALT = 230, /**< alt gr, option */
-    SDL_SCANCODE_RGUI = 231, /**< windows, command (apple), meta */
-
-    SDL_SCANCODE_MODE = 257,    /**< I'm not sure if this is really not covered
-                                 *   by any of the above, but since there's a
-                                 *   special KMOD_MODE for it I'm adding it here
-                                 */
-
-    /* @} *//* Usage page 0x07 */
-
-    /**
-     *  \name Usage page 0x0C
-     *
-     *  These values are mapped from usage page 0x0C (USB consumer page).
-     */
-    /* @{ */
-
-    SDL_SCANCODE_AUDIONEXT = 258,
-    SDL_SCANCODE_AUDIOPREV = 259,
-    SDL_SCANCODE_AUDIOSTOP = 260,
-    SDL_SCANCODE_AUDIOPLAY = 261,
-    SDL_SCANCODE_AUDIOMUTE = 262,
-    SDL_SCANCODE_MEDIASELECT = 263,
-    SDL_SCANCODE_WWW = 264,
-    SDL_SCANCODE_MAIL = 265,
-    SDL_SCANCODE_CALCULATOR = 266,
-    SDL_SCANCODE_COMPUTER = 267,
-    SDL_SCANCODE_AC_SEARCH = 268,
-    SDL_SCANCODE_AC_HOME = 269,
-    SDL_SCANCODE_AC_BACK = 270,
-    SDL_SCANCODE_AC_FORWARD = 271,
-    SDL_SCANCODE_AC_STOP = 272,
-    SDL_SCANCODE_AC_REFRESH = 273,
-    SDL_SCANCODE_AC_BOOKMARKS = 274,
-
-    /* @} *//* Usage page 0x0C */
-
-    /**
-     *  \name Walther keys
-     *
-     *  These are values that Christian Walther added (for mac keyboard?).
-     */
-    /* @{ */
-
-    SDL_SCANCODE_BRIGHTNESSDOWN = 275,
-    SDL_SCANCODE_BRIGHTNESSUP = 276,
-    SDL_SCANCODE_DISPLAYSWITCH = 277, /**< display mirroring/dual display
-                                           switch, video mode switch */
-    SDL_SCANCODE_KBDILLUMTOGGLE = 278,
-    SDL_SCANCODE_KBDILLUMDOWN = 279,
-    SDL_SCANCODE_KBDILLUMUP = 280,
-    SDL_SCANCODE_EJECT = 281,
-    SDL_SCANCODE_SLEEP = 282,
-
-    SDL_SCANCODE_APP1 = 283,
-    SDL_SCANCODE_APP2 = 284,
-
-    /* @} *//* Walther keys */
-
-    /* Add any other keys here. */
-
-    SDL_NUM_SCANCODES = 512 /**< not a key, just marks the number of scancodes
-                                 for array bounds */
-} SDL_Scancode;
-
-#endif /* _SDL_scancode_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_shape.h b/linux-x86/include/SDL2/SDL_shape.h
deleted file mode 100644
index 5302930..0000000
--- a/linux-x86/include/SDL2/SDL_shape.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_shape_h
-#define _SDL_shape_h
-
-#include "SDL_stdinc.h"
-#include "SDL_pixels.h"
-#include "SDL_rect.h"
-#include "SDL_surface.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \file SDL_shape.h
- *
- * Header file for the shaped window API.
- */
-
-#define SDL_NONSHAPEABLE_WINDOW -1
-#define SDL_INVALID_SHAPE_ARGUMENT -2
-#define SDL_WINDOW_LACKS_SHAPE -3
-
-/**
- *  \brief Create a window that can be shaped with the specified position, dimensions, and flags.
- *
- *  \param title The title of the window, in UTF-8 encoding.
- *  \param x     The x position of the window, ::SDL_WINDOWPOS_CENTERED, or
- *               ::SDL_WINDOWPOS_UNDEFINED.
- *  \param y     The y position of the window, ::SDL_WINDOWPOS_CENTERED, or
- *               ::SDL_WINDOWPOS_UNDEFINED.
- *  \param w     The width of the window.
- *  \param h     The height of the window.
- *  \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with any of the following:
- *               ::SDL_WINDOW_OPENGL,     ::SDL_WINDOW_INPUT_GRABBED,
- *               ::SDL_WINDOW_HIDDEN,     ::SDL_WINDOW_RESIZABLE,
- *               ::SDL_WINDOW_MAXIMIZED,  ::SDL_WINDOW_MINIMIZED,
- *       ::SDL_WINDOW_BORDERLESS is always set, and ::SDL_WINDOW_FULLSCREEN is always unset.
- *
- *  \return The window created, or NULL if window creation failed.
- *
- *  \sa SDL_DestroyWindow()
- */
-extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags);
-
-/**
- * \brief Return whether the given window is a shaped window.
- *
- * \param window The window to query for being shaped.
- *
- * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if the window is unshaped or NULL.
- * \sa SDL_CreateShapedWindow
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsShapedWindow(const SDL_Window *window);
-
-/** \brief An enum denoting the specific type of contents present in an SDL_WindowShapeParams union. */
-typedef enum {
-    /** \brief The default mode, a binarized alpha cutoff of 1. */
-    ShapeModeDefault,
-    /** \brief A binarized alpha cutoff with a given integer value. */
-    ShapeModeBinarizeAlpha,
-    /** \brief A binarized alpha cutoff with a given integer value, but with the opposite comparison. */
-    ShapeModeReverseBinarizeAlpha,
-    /** \brief A color key is applied. */
-    ShapeModeColorKey
-} WindowShapeMode;
-
-#define SDL_SHAPEMODEALPHA(mode) (mode == ShapeModeDefault || mode == ShapeModeBinarizeAlpha || mode == ShapeModeReverseBinarizeAlpha)
-
-/** \brief A union containing parameters for shaped windows. */
-typedef union {
-    /** \brief a cutoff alpha value for binarization of the window shape's alpha channel. */
-    Uint8 binarizationCutoff;
-    SDL_Color colorKey;
-} SDL_WindowShapeParams;
-
-/** \brief A struct that tags the SDL_WindowShapeParams union with an enum describing the type of its contents. */
-typedef struct SDL_WindowShapeMode {
-    /** \brief The mode of these window-shape parameters. */
-    WindowShapeMode mode;
-    /** \brief Window-shape parameters. */
-    SDL_WindowShapeParams parameters;
-} SDL_WindowShapeMode;
-
-/**
- * \brief Set the shape and parameters of a shaped window.
- *
- * \param window The shaped window whose parameters should be set.
- * \param shape A surface encoding the desired shape for the window.
- * \param shape_mode The parameters to set for the shaped window.
- *
- * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on invalid an invalid shape argument, or SDL_NONSHAPEABLE_WINDOW
- *           if the SDL_Window* given does not reference a valid shaped window.
- *
- * \sa SDL_WindowShapeMode
- * \sa SDL_GetShapedWindowMode.
- */
-extern DECLSPEC int SDLCALL SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
-
-/**
- * \brief Get the shape parameters of a shaped window.
- *
- * \param window The shaped window whose parameters should be retrieved.
- * \param shape_mode An empty shape-mode structure to fill, or NULL to check whether the window has a shape.
- *
- * \return 0 if the window has a shape and, provided shape_mode was not NULL, shape_mode has been filled with the mode
- *           data, SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped window, or SDL_WINDOW_LACKS_SHAPE if
- *           the SDL_Window* given is a shapeable window currently lacking a shape.
- *
- * \sa SDL_WindowShapeMode
- * \sa SDL_SetWindowShape
- */
-extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shape_mode);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_shape_h */
diff --git a/linux-x86/include/SDL2/SDL_stdinc.h b/linux-x86/include/SDL2/SDL_stdinc.h
deleted file mode 100644
index 31b343d..0000000
--- a/linux-x86/include/SDL2/SDL_stdinc.h
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_stdinc.h
- *
- *  This is a general header that includes C language support.
- */
-
-#ifndef _SDL_stdinc_h
-#define _SDL_stdinc_h
-
-#include "SDL_config.h"
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if defined(STDC_HEADERS)
-# include <stdlib.h>
-# include <stddef.h>
-# include <stdarg.h>
-#else
-# if defined(HAVE_STDLIB_H)
-#  include <stdlib.h>
-# elif defined(HAVE_MALLOC_H)
-#  include <malloc.h>
-# endif
-# if defined(HAVE_STDDEF_H)
-#  include <stddef.h>
-# endif
-# if defined(HAVE_STDARG_H)
-#  include <stdarg.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(HAVE_STDINT_H)
-# include <stdint.h>
-#endif
-#ifdef HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-#ifdef HAVE_MATH_H
-# if defined(__WINRT__)
-/* Defining _USE_MATH_DEFINES is required to get M_PI to be defined on
-   WinRT.  See http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx
-   for more information.
-*/
-#  define _USE_MATH_DEFINES
-# endif
-# include <math.h>
-#endif
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
-#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
-# include <iconv.h>
-#endif
-
-/**
- *  The number of elements in an array.
- */
-#define SDL_arraysize(array)    (sizeof(array)/sizeof(array[0]))
-#define SDL_TABLESIZE(table)    SDL_arraysize(table)
-
-/**
- *  \name Cast operators
- *
- *  Use proper C++ casts when compiled as C++ to be compatible with the option
- *  -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above).
- */
-/* @{ */
-#ifdef __cplusplus
-#define SDL_reinterpret_cast(type, expression) reinterpret_cast<type>(expression)
-#define SDL_static_cast(type, expression) static_cast<type>(expression)
-#define SDL_const_cast(type, expression) const_cast<type>(expression)
-#else
-#define SDL_reinterpret_cast(type, expression) ((type)(expression))
-#define SDL_static_cast(type, expression) ((type)(expression))
-#define SDL_const_cast(type, expression) ((type)(expression))
-#endif
-/* @} *//* Cast operators */
-
-/* Define a four character code as a Uint32 */
-#define SDL_FOURCC(A, B, C, D) \
-    ((SDL_static_cast(Uint32, SDL_static_cast(Uint8, (A))) << 0) | \
-     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (B))) << 8) | \
-     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (C))) << 16) | \
-     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (D))) << 24))
-
-/**
- *  \name Basic data types
- */
-/* @{ */
-
-typedef enum
-{
-    SDL_FALSE = 0,
-    SDL_TRUE = 1
-} SDL_bool;
-
-/**
- * \brief A signed 8-bit integer type.
- */
-typedef int8_t Sint8;
-/**
- * \brief An unsigned 8-bit integer type.
- */
-typedef uint8_t Uint8;
-/**
- * \brief A signed 16-bit integer type.
- */
-typedef int16_t Sint16;
-/**
- * \brief An unsigned 16-bit integer type.
- */
-typedef uint16_t Uint16;
-/**
- * \brief A signed 32-bit integer type.
- */
-typedef int32_t Sint32;
-/**
- * \brief An unsigned 32-bit integer type.
- */
-typedef uint32_t Uint32;
-
-/**
- * \brief A signed 64-bit integer type.
- */
-typedef int64_t Sint64;
-/**
- * \brief An unsigned 64-bit integer type.
- */
-typedef uint64_t Uint64;
-
-/* @} *//* Basic data types */
-
-
-#define SDL_COMPILE_TIME_ASSERT(name, x)               \
-       typedef int SDL_dummy_ ## name[(x) * 2 - 1]
-/** \cond */
-#ifndef DOXYGEN_SHOULD_IGNORE_THIS
-SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);
-SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
-SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
-SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
-SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
-SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
-SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
-SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
-#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
-/** \endcond */
-
-/* Check to make sure enums are the size of ints, for structure packing.
-   For both Watcom C/C++ and Borland C/C++ the compiler option that makes
-   enums having the size of an int must be enabled.
-   This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11).
-*/
-
-/** \cond */
-#ifndef DOXYGEN_SHOULD_IGNORE_THIS
-#if !defined(__ANDROID__)
-   /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */
-typedef enum
-{
-    DUMMY_ENUM_VALUE
-} SDL_DUMMY_ENUM;
-
-SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
-#endif
-#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
-/** \endcond */
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(HAVE_ALLOCA) && !defined(alloca)
-# if defined(HAVE_ALLOCA_H)
-#  include <alloca.h>
-# elif defined(__GNUC__)
-#  define alloca __builtin_alloca
-# elif defined(_MSC_VER)
-#  include <malloc.h>
-#  define alloca _alloca
-# elif defined(__WATCOMC__)
-#  include <malloc.h>
-# elif defined(__BORLANDC__)
-#  include <malloc.h>
-# elif defined(__DMC__)
-#  include <stdlib.h>
-# elif defined(__AIX__)
-#pragma alloca
-# elif defined(__MRC__)
-void *alloca(unsigned);
-# else
-char *alloca();
-# endif
-#endif
-#ifdef HAVE_ALLOCA
-#define SDL_stack_alloc(type, count)    (type*)alloca(sizeof(type)*(count))
-#define SDL_stack_free(data)
-#else
-#define SDL_stack_alloc(type, count)    (type*)SDL_malloc(sizeof(type)*(count))
-#define SDL_stack_free(data)            SDL_free(data)
-#endif
-
-extern DECLSPEC void *SDLCALL SDL_malloc(size_t size);
-extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size);
-extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size);
-extern DECLSPEC void SDLCALL SDL_free(void *mem);
-
-extern DECLSPEC char *SDLCALL SDL_getenv(const char *name);
-extern DECLSPEC int SDLCALL SDL_setenv(const char *name, const char *value, int overwrite);
-
-extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, int (*compare) (const void *, const void *));
-
-extern DECLSPEC int SDLCALL SDL_abs(int x);
-
-/* !!! FIXME: these have side effects. You probably shouldn't use them. */
-/* !!! FIXME: Maybe we do forceinline functions of SDL_mini, SDL_minf, etc? */
-#define SDL_min(x, y) (((x) < (y)) ? (x) : (y))
-#define SDL_max(x, y) (((x) > (y)) ? (x) : (y))
-
-extern DECLSPEC int SDLCALL SDL_isdigit(int x);
-extern DECLSPEC int SDLCALL SDL_isspace(int x);
-extern DECLSPEC int SDLCALL SDL_toupper(int x);
-extern DECLSPEC int SDLCALL SDL_tolower(int x);
-
-extern DECLSPEC void *SDLCALL SDL_memset(void *dst, int c, size_t len);
-
-#define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x)))
-#define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x)))
-
-/* Note that memset() is a byte assignment and this is a 32-bit assignment, so they're not directly equivalent. */
-SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords)
-{
-#if defined(__GNUC__) && defined(i386)
-    int u0, u1, u2;
-    __asm__ __volatile__ (
-        "cld \n\t"
-        "rep ; stosl \n\t"
-        : "=&D" (u0), "=&a" (u1), "=&c" (u2)
-        : "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, dwords))
-        : "memory"
-    );
-#else
-    size_t _n = (dwords + 3) / 4;
-    Uint32 *_p = SDL_static_cast(Uint32 *, dst);
-    Uint32 _val = (val);
-    if (dwords == 0)
-        return;
-    switch (dwords % 4)
-    {
-        case 0: do {    *_p++ = _val;
-        case 3:         *_p++ = _val;
-        case 2:         *_p++ = _val;
-        case 1:         *_p++ = _val;
-        } while ( --_n );
-    }
-#endif
-}
-
-
-extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src, size_t len);
-
-SDL_FORCE_INLINE void *SDL_memcpy4(void *dst, const void *src, size_t dwords)
-{
-    return SDL_memcpy(dst, src, dwords * 4);
-}
-
-extern DECLSPEC void *SDLCALL SDL_memmove(void *dst, const void *src, size_t len);
-extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len);
-
-extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr);
-extern DECLSPEC size_t SDLCALL SDL_wcslcpy(wchar_t *dst, const wchar_t *src, size_t maxlen);
-extern DECLSPEC size_t SDLCALL SDL_wcslcat(wchar_t *dst, const wchar_t *src, size_t maxlen);
-
-extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str);
-extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen);
-extern DECLSPEC size_t SDLCALL SDL_utf8strlcpy(char *dst, const char *src, size_t dst_bytes);
-extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen);
-extern DECLSPEC char *SDLCALL SDL_strdup(const char *str);
-extern DECLSPEC char *SDLCALL SDL_strrev(char *str);
-extern DECLSPEC char *SDLCALL SDL_strupr(char *str);
-extern DECLSPEC char *SDLCALL SDL_strlwr(char *str);
-extern DECLSPEC char *SDLCALL SDL_strchr(const char *str, int c);
-extern DECLSPEC char *SDLCALL SDL_strrchr(const char *str, int c);
-extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, const char *needle);
-
-extern DECLSPEC char *SDLCALL SDL_itoa(int value, char *str, int radix);
-extern DECLSPEC char *SDLCALL SDL_uitoa(unsigned int value, char *str, int radix);
-extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *str, int radix);
-extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *str, int radix);
-extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *str, int radix);
-extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *str, int radix);
-
-extern DECLSPEC int SDLCALL SDL_atoi(const char *str);
-extern DECLSPEC double SDLCALL SDL_atof(const char *str);
-extern DECLSPEC long SDLCALL SDL_strtol(const char *str, char **endp, int base);
-extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *str, char **endp, int base);
-extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *str, char **endp, int base);
-extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *str, char **endp, int base);
-extern DECLSPEC double SDLCALL SDL_strtod(const char *str, char **endp);
-
-extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
-extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen);
-extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2);
-extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t len);
-
-extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...);
-extern DECLSPEC int SDLCALL SDL_vsscanf(const char *text, const char *fmt, va_list ap);
-extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...);
-extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap);
-
-#ifndef HAVE_M_PI
-#ifndef M_PI
-#define M_PI    3.14159265358979323846264338327950288   /* pi */
-#endif
-#endif
-
-extern DECLSPEC double SDLCALL SDL_acos(double x);
-extern DECLSPEC double SDLCALL SDL_asin(double x);
-extern DECLSPEC double SDLCALL SDL_atan(double x);
-extern DECLSPEC double SDLCALL SDL_atan2(double x, double y);
-extern DECLSPEC double SDLCALL SDL_ceil(double x);
-extern DECLSPEC double SDLCALL SDL_copysign(double x, double y);
-extern DECLSPEC double SDLCALL SDL_cos(double x);
-extern DECLSPEC float SDLCALL SDL_cosf(float x);
-extern DECLSPEC double SDLCALL SDL_fabs(double x);
-extern DECLSPEC double SDLCALL SDL_floor(double x);
-extern DECLSPEC double SDLCALL SDL_log(double x);
-extern DECLSPEC double SDLCALL SDL_pow(double x, double y);
-extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n);
-extern DECLSPEC double SDLCALL SDL_sin(double x);
-extern DECLSPEC float SDLCALL SDL_sinf(float x);
-extern DECLSPEC double SDLCALL SDL_sqrt(double x);
-
-/* The SDL implementation of iconv() returns these error codes */
-#define SDL_ICONV_ERROR     (size_t)-1
-#define SDL_ICONV_E2BIG     (size_t)-2
-#define SDL_ICONV_EILSEQ    (size_t)-3
-#define SDL_ICONV_EINVAL    (size_t)-4
-
-/* SDL_iconv_* are now always real symbols/types, not macros or inlined. */
-typedef struct _SDL_iconv_t *SDL_iconv_t;
-extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode,
-                                                   const char *fromcode);
-extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
-extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf,
-                                         size_t * inbytesleft, char **outbuf,
-                                         size_t * outbytesleft);
-/**
- *  This function converts a string between encodings in one pass, returning a
- *  string that must be freed with SDL_free() or NULL on error.
- */
-extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode,
-                                               const char *fromcode,
-                                               const char *inbuf,
-                                               size_t inbytesleft);
-#define SDL_iconv_utf8_locale(S)    SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs2(S)      (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs4(S)      (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_stdinc_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_surface.h b/linux-x86/include/SDL2/SDL_surface.h
deleted file mode 100644
index aa8d821..0000000
--- a/linux-x86/include/SDL2/SDL_surface.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_surface.h
- *
- *  Header file for ::SDL_Surface definition and management functions.
- */
-
-#ifndef _SDL_surface_h
-#define _SDL_surface_h
-
-#include "SDL_stdinc.h"
-#include "SDL_pixels.h"
-#include "SDL_rect.h"
-#include "SDL_blendmode.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \name Surface flags
- *
- *  These are the currently supported flags for the ::SDL_Surface.
- *
- *  \internal
- *  Used internally (read-only).
- */
-/* @{ */
-#define SDL_SWSURFACE       0           /**< Just here for compatibility */
-#define SDL_PREALLOC        0x00000001  /**< Surface uses preallocated memory */
-#define SDL_RLEACCEL        0x00000002  /**< Surface is RLE encoded */
-#define SDL_DONTFREE        0x00000004  /**< Surface is referenced internally */
-/* @} *//* Surface flags */
-
-/**
- *  Evaluates to true if the surface needs to be locked before access.
- */
-#define SDL_MUSTLOCK(S) (((S)->flags & SDL_RLEACCEL) != 0)
-
-/**
- * \brief A collection of pixels used in software blitting.
- *
- * \note  This structure should be treated as read-only, except for \c pixels,
- *        which, if not NULL, contains the raw pixel data for the surface.
- */
-typedef struct SDL_Surface
-{
-    Uint32 flags;               /**< Read-only */
-    SDL_PixelFormat *format;    /**< Read-only */
-    int w, h;                   /**< Read-only */
-    int pitch;                  /**< Read-only */
-    void *pixels;               /**< Read-write */
-
-    /** Application data associated with the surface */
-    void *userdata;             /**< Read-write */
-
-    /** information needed for surfaces requiring locks */
-    int locked;                 /**< Read-only */
-    void *lock_data;            /**< Read-only */
-
-    /** clipping information */
-    SDL_Rect clip_rect;         /**< Read-only */
-
-    /** info for fast blit mapping to other surfaces */
-    struct SDL_BlitMap *map;    /**< Private */
-
-    /** Reference count -- used when freeing surface */
-    int refcount;               /**< Read-mostly */
-} SDL_Surface;
-
-/**
- * \brief The type of function used for surface blitting functions.
- */
-typedef int (*SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect,
-                         struct SDL_Surface * dst, SDL_Rect * dstrect);
-
-/**
- *  Allocate and free an RGB surface.
- *
- *  If the depth is 4 or 8 bits, an empty palette is allocated for the surface.
- *  If the depth is greater than 8 bits, the pixel format is set using the
- *  flags '[RGB]mask'.
- *
- *  If the function runs out of memory, it will return NULL.
- *
- *  \param flags The \c flags are obsolete and should be set to 0.
- *  \param width The width in pixels of the surface to create.
- *  \param height The height in pixels of the surface to create.
- *  \param depth The depth in bits of the surface to create.
- *  \param Rmask The red mask of the surface to create.
- *  \param Gmask The green mask of the surface to create.
- *  \param Bmask The blue mask of the surface to create.
- *  \param Amask The alpha mask of the surface to create.
- */
-extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface
-    (Uint32 flags, int width, int height, int depth,
-     Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels,
-                                                              int width,
-                                                              int height,
-                                                              int depth,
-                                                              int pitch,
-                                                              Uint32 Rmask,
-                                                              Uint32 Gmask,
-                                                              Uint32 Bmask,
-                                                              Uint32 Amask);
-extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface);
-
-/**
- *  \brief Set the palette used by a surface.
- *
- *  \return 0, or -1 if the surface format doesn't use a palette.
- *
- *  \note A single palette can be shared with many surfaces.
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfacePalette(SDL_Surface * surface,
-                                                  SDL_Palette * palette);
-
-/**
- *  \brief Sets up a surface for directly accessing the pixels.
- *
- *  Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write
- *  to and read from \c surface->pixels, using the pixel format stored in
- *  \c surface->format.  Once you are done accessing the surface, you should
- *  use SDL_UnlockSurface() to release it.
- *
- *  Not all surfaces require locking.  If SDL_MUSTLOCK(surface) evaluates
- *  to 0, then you can read and write to the surface at any time, and the
- *  pixel format of the surface will not change.
- *
- *  No operating system or library calls should be made between lock/unlock
- *  pairs, as critical system locks may be held during this time.
- *
- *  SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked.
- *
- *  \sa SDL_UnlockSurface()
- */
-extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface * surface);
-/** \sa SDL_LockSurface() */
-extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface * surface);
-
-/**
- *  Load a surface from a seekable SDL data stream (memory or file).
- *
- *  If \c freesrc is non-zero, the stream will be closed after being read.
- *
- *  The new surface should be freed with SDL_FreeSurface().
- *
- *  \return the new surface, or NULL if there was an error.
- */
-extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src,
-                                                    int freesrc);
-
-/**
- *  Load a surface from a file.
- *
- *  Convenience macro.
- */
-#define SDL_LoadBMP(file)   SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1)
-
-/**
- *  Save a surface to a seekable SDL data stream (memory or file).
- *
- *  If \c freedst is non-zero, the stream will be closed after being written.
- *
- *  \return 0 if successful or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SaveBMP_RW
-    (SDL_Surface * surface, SDL_RWops * dst, int freedst);
-
-/**
- *  Save a surface to a file.
- *
- *  Convenience macro.
- */
-#define SDL_SaveBMP(surface, file) \
-        SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1)
-
-/**
- *  \brief Sets the RLE acceleration hint for a surface.
- *
- *  \return 0 on success, or -1 if the surface is not valid
- *
- *  \note If RLE is enabled, colorkey and alpha blending blits are much faster,
- *        but the surface must be locked before directly accessing the pixels.
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface,
-                                              int flag);
-
-/**
- *  \brief Sets the color key (transparent pixel) in a blittable surface.
- *
- *  \param surface The surface to update
- *  \param flag Non-zero to enable colorkey and 0 to disable colorkey
- *  \param key The transparent pixel in the native surface format
- *
- *  \return 0 on success, or -1 if the surface is not valid
- *
- *  You can pass SDL_RLEACCEL to enable RLE accelerated blits.
- */
-extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface,
-                                            int flag, Uint32 key);
-
-/**
- *  \brief Gets the color key (transparent pixel) in a blittable surface.
- *
- *  \param surface The surface to update
- *  \param key A pointer filled in with the transparent pixel in the native
- *             surface format
- *
- *  \return 0 on success, or -1 if the surface is not valid or colorkey is not
- *          enabled.
- */
-extern DECLSPEC int SDLCALL SDL_GetColorKey(SDL_Surface * surface,
-                                            Uint32 * key);
-
-/**
- *  \brief Set an additional color value used in blit operations.
- *
- *  \param surface The surface to update.
- *  \param r The red color value multiplied into blit operations.
- *  \param g The green color value multiplied into blit operations.
- *  \param b The blue color value multiplied into blit operations.
- *
- *  \return 0 on success, or -1 if the surface is not valid.
- *
- *  \sa SDL_GetSurfaceColorMod()
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfaceColorMod(SDL_Surface * surface,
-                                                   Uint8 r, Uint8 g, Uint8 b);
-
-
-/**
- *  \brief Get the additional color value used in blit operations.
- *
- *  \param surface The surface to query.
- *  \param r A pointer filled in with the current red color value.
- *  \param g A pointer filled in with the current green color value.
- *  \param b A pointer filled in with the current blue color value.
- *
- *  \return 0 on success, or -1 if the surface is not valid.
- *
- *  \sa SDL_SetSurfaceColorMod()
- */
-extern DECLSPEC int SDLCALL SDL_GetSurfaceColorMod(SDL_Surface * surface,
-                                                   Uint8 * r, Uint8 * g,
-                                                   Uint8 * b);
-
-/**
- *  \brief Set an additional alpha value used in blit operations.
- *
- *  \param surface The surface to update.
- *  \param alpha The alpha value multiplied into blit operations.
- *
- *  \return 0 on success, or -1 if the surface is not valid.
- *
- *  \sa SDL_GetSurfaceAlphaMod()
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfaceAlphaMod(SDL_Surface * surface,
-                                                   Uint8 alpha);
-
-/**
- *  \brief Get the additional alpha value used in blit operations.
- *
- *  \param surface The surface to query.
- *  \param alpha A pointer filled in with the current alpha value.
- *
- *  \return 0 on success, or -1 if the surface is not valid.
- *
- *  \sa SDL_SetSurfaceAlphaMod()
- */
-extern DECLSPEC int SDLCALL SDL_GetSurfaceAlphaMod(SDL_Surface * surface,
-                                                   Uint8 * alpha);
-
-/**
- *  \brief Set the blend mode used for blit operations.
- *
- *  \param surface The surface to update.
- *  \param blendMode ::SDL_BlendMode to use for blit blending.
- *
- *  \return 0 on success, or -1 if the parameters are not valid.
- *
- *  \sa SDL_GetSurfaceBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfaceBlendMode(SDL_Surface * surface,
-                                                    SDL_BlendMode blendMode);
-
-/**
- *  \brief Get the blend mode used for blit operations.
- *
- *  \param surface   The surface to query.
- *  \param blendMode A pointer filled in with the current blend mode.
- *
- *  \return 0 on success, or -1 if the surface is not valid.
- *
- *  \sa SDL_SetSurfaceBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_GetSurfaceBlendMode(SDL_Surface * surface,
-                                                    SDL_BlendMode *blendMode);
-
-/**
- *  Sets the clipping rectangle for the destination surface in a blit.
- *
- *  If the clip rectangle is NULL, clipping will be disabled.
- *
- *  If the clip rectangle doesn't intersect the surface, the function will
- *  return SDL_FALSE and blits will be completely clipped.  Otherwise the
- *  function returns SDL_TRUE and blits to the surface will be clipped to
- *  the intersection of the surface area and the clipping rectangle.
- *
- *  Note that blits are automatically clipped to the edges of the source
- *  and destination surfaces.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface * surface,
-                                                 const SDL_Rect * rect);
-
-/**
- *  Gets the clipping rectangle for the destination surface in a blit.
- *
- *  \c rect must be a pointer to a valid rectangle which will be filled
- *  with the correct values.
- */
-extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface,
-                                             SDL_Rect * rect);
-
-/**
- *  Creates a new surface of the specified format, and then copies and maps
- *  the given surface to it so the blit of the converted surface will be as
- *  fast as possible.  If this function fails, it returns NULL.
- *
- *  The \c flags parameter is passed to SDL_CreateRGBSurface() and has those
- *  semantics.  You can also pass ::SDL_RLEACCEL in the flags parameter and
- *  SDL will try to RLE accelerate colorkey and alpha blits in the resulting
- *  surface.
- */
-extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface
-    (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags);
-extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat
-    (SDL_Surface * src, Uint32 pixel_format, Uint32 flags);
-
-/**
- * \brief Copy a block of pixels of one format to another format
- *
- *  \return 0 on success, or -1 if there was an error
- */
-extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height,
-                                              Uint32 src_format,
-                                              const void * src, int src_pitch,
-                                              Uint32 dst_format,
-                                              void * dst, int dst_pitch);
-
-/**
- *  Performs a fast fill of the given rectangle with \c color.
- *
- *  If \c rect is NULL, the whole surface will be filled with \c color.
- *
- *  The color should be a pixel of the format used by the surface, and
- *  can be generated by the SDL_MapRGB() function.
- *
- *  \return 0 on success, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_FillRect
-    (SDL_Surface * dst, const SDL_Rect * rect, Uint32 color);
-extern DECLSPEC int SDLCALL SDL_FillRects
-    (SDL_Surface * dst, const SDL_Rect * rects, int count, Uint32 color);
-
-/**
- *  Performs a fast blit from the source surface to the destination surface.
- *
- *  This assumes that the source and destination rectangles are
- *  the same size.  If either \c srcrect or \c dstrect are NULL, the entire
- *  surface (\c src or \c dst) is copied.  The final blit rectangles are saved
- *  in \c srcrect and \c dstrect after all clipping is performed.
- *
- *  \return If the blit is successful, it returns 0, otherwise it returns -1.
- *
- *  The blit function should not be called on a locked surface.
- *
- *  The blit semantics for surfaces with and without blending and colorkey
- *  are defined as follows:
- *  \verbatim
-    RGBA->RGB:
-      Source surface blend mode set to SDL_BLENDMODE_BLEND:
-        alpha-blend (using the source alpha-channel and per-surface alpha)
-        SDL_SRCCOLORKEY ignored.
-      Source surface blend mode set to SDL_BLENDMODE_NONE:
-        copy RGB.
-        if SDL_SRCCOLORKEY set, only copy the pixels matching the
-        RGB values of the source color key, ignoring alpha in the
-        comparison.
-
-    RGB->RGBA:
-      Source surface blend mode set to SDL_BLENDMODE_BLEND:
-        alpha-blend (using the source per-surface alpha)
-      Source surface blend mode set to SDL_BLENDMODE_NONE:
-        copy RGB, set destination alpha to source per-surface alpha value.
-      both:
-        if SDL_SRCCOLORKEY set, only copy the pixels matching the
-        source color key.
-
-    RGBA->RGBA:
-      Source surface blend mode set to SDL_BLENDMODE_BLEND:
-        alpha-blend (using the source alpha-channel and per-surface alpha)
-        SDL_SRCCOLORKEY ignored.
-      Source surface blend mode set to SDL_BLENDMODE_NONE:
-        copy all of RGBA to the destination.
-        if SDL_SRCCOLORKEY set, only copy the pixels matching the
-        RGB values of the source color key, ignoring alpha in the
-        comparison.
-
-    RGB->RGB:
-      Source surface blend mode set to SDL_BLENDMODE_BLEND:
-        alpha-blend (using the source per-surface alpha)
-      Source surface blend mode set to SDL_BLENDMODE_NONE:
-        copy RGB.
-      both:
-        if SDL_SRCCOLORKEY set, only copy the pixels matching the
-        source color key.
-    \endverbatim
- *
- *  You should call SDL_BlitSurface() unless you know exactly how SDL
- *  blitting works internally and how to use the other blit functions.
- */
-#define SDL_BlitSurface SDL_UpperBlit
-
-/**
- *  This is the public blit function, SDL_BlitSurface(), and it performs
- *  rectangle validation and clipping before passing it to SDL_LowerBlit()
- */
-extern DECLSPEC int SDLCALL SDL_UpperBlit
-    (SDL_Surface * src, const SDL_Rect * srcrect,
-     SDL_Surface * dst, SDL_Rect * dstrect);
-
-/**
- *  This is a semi-private blit function and it performs low-level surface
- *  blitting only.
- */
-extern DECLSPEC int SDLCALL SDL_LowerBlit
-    (SDL_Surface * src, SDL_Rect * srcrect,
-     SDL_Surface * dst, SDL_Rect * dstrect);
-
-/**
- *  \brief Perform a fast, low quality, stretch blit between two surfaces of the
- *         same pixel format.
- *
- *  \note This function uses a static buffer, and is not thread-safe.
- */
-extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface * src,
-                                            const SDL_Rect * srcrect,
-                                            SDL_Surface * dst,
-                                            const SDL_Rect * dstrect);
-
-#define SDL_BlitScaled SDL_UpperBlitScaled
-
-/**
- *  This is the public scaled blit function, SDL_BlitScaled(), and it performs
- *  rectangle validation and clipping before passing it to SDL_LowerBlitScaled()
- */
-extern DECLSPEC int SDLCALL SDL_UpperBlitScaled
-    (SDL_Surface * src, const SDL_Rect * srcrect,
-    SDL_Surface * dst, SDL_Rect * dstrect);
-
-/**
- *  This is a semi-private blit function and it performs low-level surface
- *  scaled blitting only.
- */
-extern DECLSPEC int SDLCALL SDL_LowerBlitScaled
-    (SDL_Surface * src, SDL_Rect * srcrect,
-    SDL_Surface * dst, SDL_Rect * dstrect);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_surface_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_system.h b/linux-x86/include/SDL2/SDL_system.h
deleted file mode 100644
index fd929f7..0000000
--- a/linux-x86/include/SDL2/SDL_system.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_system.h
- *
- *  Include file for platform specific SDL API functions
- */
-
-#ifndef _SDL_system_h
-#define _SDL_system_h
-
-#include "SDL_stdinc.h"
-#include "SDL_keyboard.h"
-#include "SDL_render.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Platform specific functions for Windows */
-#ifdef __WIN32__
-
-/* Returns the D3D9 adapter index that matches the specified display index.
-   This adapter index can be passed to IDirect3D9::CreateDevice and controls
-   on which monitor a full screen application will appear.
-*/
-extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex );
-
-/* Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer.
-   Once you are done using the device, you should release it to avoid a resource leak.
- */
-typedef struct IDirect3DDevice9 IDirect3DDevice9;
-extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer);
-
-/* Returns the DXGI Adapter and Output indices for the specified display index. 
-   These can be passed to EnumAdapters and EnumOutputs respectively to get the objects
-   required to create a DX10 or DX11 device and swap chain.
- */
-extern DECLSPEC void SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex );
-
-#endif /* __WIN32__ */
-
-
-/* Platform specific functions for iOS */
-#if defined(__IPHONEOS__) && __IPHONEOS__
-
-extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
-extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
-
-#endif /* __IPHONEOS__ */
-
-
-/* Platform specific functions for Android */
-#if defined(__ANDROID__) && __ANDROID__
-
-/* Get the JNI environment for the current thread
-   This returns JNIEnv*, but the prototype is void* so we don't need jni.h
- */
-extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv();
-
-/* Get the SDL Activity object for the application
-   This returns jobject, but the prototype is void* so we don't need jni.h
-   The jobject returned by SDL_AndroidGetActivity is a local reference.
-   It is the caller's responsibility to properly release it
-   (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef)
- */
-extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity();
-
-/* See the official Android developer guide for more information:
-   http://developer.android.com/guide/topics/data/data-storage.html
-*/
-#define SDL_ANDROID_EXTERNAL_STORAGE_READ   0x01
-#define SDL_ANDROID_EXTERNAL_STORAGE_WRITE  0x02
-
-/* Get the path used for internal storage for this application.
-   This path is unique to your application and cannot be written to
-   by other applications.
- */
-extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath();
-
-/* Get the current state of external storage, a bitmask of these values:
-    SDL_ANDROID_EXTERNAL_STORAGE_READ
-    SDL_ANDROID_EXTERNAL_STORAGE_WRITE
-   If external storage is currently unavailable, this will return 0.
-*/
-extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState();
-
-/* Get the path used for external storage for this application.
-   This path is unique to your application, but is public and can be
-   written to by other applications.
- */
-extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath();
-
-#endif /* __ANDROID__ */
-
-/* Platform specific functions for WinRT */
-#if defined(__WINRT__) && __WINRT__
-
-/**
- *  \brief WinRT / Windows Phone path types
- */
-typedef enum
-{
-    /** \brief The installed app's root directory.
-        Files here are likely to be read-only. */
-    SDL_WINRT_PATH_INSTALLED_LOCATION,
-
-    /** \brief The app's local data store.  Files may be written here */
-    SDL_WINRT_PATH_LOCAL_FOLDER,
-
-    /** \brief The app's roaming data store.  Unsupported on Windows Phone.
-        Files written here may be copied to other machines via a network
-        connection.
-    */
-    SDL_WINRT_PATH_ROAMING_FOLDER,
-
-    /** \brief The app's temporary data store.  Unsupported on Windows Phone.
-        Files written here may be deleted at any time. */
-    SDL_WINRT_PATH_TEMP_FOLDER
-} SDL_WinRT_Path;
-
-
-/**
- *  \brief Retrieves a WinRT defined path on the local file system
- *
- *  \note Documentation on most app-specific path types on WinRT
- *      can be found on MSDN, at the URL:
- *      http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
- *
- *  \param pathType The type of path to retrieve.
- *  \ret A UCS-2 string (16-bit, wide-char) containing the path, or NULL
- *      if the path is not available for any reason.  Not all paths are
- *      available on all versions of Windows.  This is especially true on
- *      Windows Phone.  Check the documentation for the given
- *      SDL_WinRT_Path for more information on which path types are
- *      supported where.
- */
-extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType);
-
-/**
- *  \brief Retrieves a WinRT defined path on the local file system
- *
- *  \note Documentation on most app-specific path types on WinRT
- *      can be found on MSDN, at the URL:
- *      http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
- *
- *  \param pathType The type of path to retrieve.
- *  \ret A UTF-8 string (8-bit, multi-byte) containing the path, or NULL
- *      if the path is not available for any reason.  Not all paths are
- *      available on all versions of Windows.  This is especially true on
- *      Windows Phone.  Check the documentation for the given
- *      SDL_WinRT_Path for more information on which path types are
- *      supported where.
- */
-extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType);
-
-#endif /* __WINRT__ */
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_system_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_syswm.h b/linux-x86/include/SDL2/SDL_syswm.h
deleted file mode 100644
index a3fe738..0000000
--- a/linux-x86/include/SDL2/SDL_syswm.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_syswm.h
- *
- *  Include file for SDL custom system window manager hooks.
- */
-
-#ifndef _SDL_syswm_h
-#define _SDL_syswm_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-#include "SDL_version.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \file SDL_syswm.h
- *
- *  Your application has access to a special type of event ::SDL_SYSWMEVENT,
- *  which contains window-manager specific information and arrives whenever
- *  an unhandled window event occurs.  This event is ignored by default, but
- *  you can enable it with SDL_EventState().
- */
-#ifdef SDL_PROTOTYPES_ONLY
-struct SDL_SysWMinfo;
-#else
-
-#if defined(SDL_VIDEO_DRIVER_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-#if defined(SDL_VIDEO_DRIVER_WINRT)
-#include <Inspectable.h>
-#endif
-
-/* This is the structure for custom window manager events */
-#if defined(SDL_VIDEO_DRIVER_X11)
-#if defined(__APPLE__) && defined(__MACH__)
-/* conflicts with Quickdraw.h */
-#define Cursor X11Cursor
-#endif
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-#if defined(__APPLE__) && defined(__MACH__)
-/* matches the re-define above */
-#undef Cursor
-#endif
-
-#endif /* defined(SDL_VIDEO_DRIVER_X11) */
-
-#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
-#include <directfb.h>
-#endif
-
-#if defined(SDL_VIDEO_DRIVER_COCOA)
-#ifdef __OBJC__
-#include <Cocoa/Cocoa.h>
-#else
-typedef struct _NSWindow NSWindow;
-#endif
-#endif
-
-#if defined(SDL_VIDEO_DRIVER_UIKIT)
-#ifdef __OBJC__
-#include <UIKit/UIKit.h>
-#else
-typedef struct _UIWindow UIWindow;
-typedef struct _UIViewController UIViewController;
-#endif
-#endif
-
-#if defined(SDL_VIDEO_DRIVER_MIR)
-#include <mir_toolkit/mir_client_library.h>
-#endif
-
-
-/**
- *  These are the various supported windowing subsystems
- */
-typedef enum
-{
-    SDL_SYSWM_UNKNOWN,
-    SDL_SYSWM_WINDOWS,
-    SDL_SYSWM_X11,
-    SDL_SYSWM_DIRECTFB,
-    SDL_SYSWM_COCOA,
-    SDL_SYSWM_UIKIT,
-    SDL_SYSWM_WAYLAND,
-    SDL_SYSWM_MIR,
-    SDL_SYSWM_WINRT,
-} SDL_SYSWM_TYPE;
-
-/**
- *  The custom event structure.
- */
-struct SDL_SysWMmsg
-{
-    SDL_version version;
-    SDL_SYSWM_TYPE subsystem;
-    union
-    {
-#if defined(SDL_VIDEO_DRIVER_WINDOWS)
-        struct {
-            HWND hwnd;                  /**< The window for the message */
-            UINT msg;                   /**< The type of message */
-            WPARAM wParam;              /**< WORD message parameter */
-            LPARAM lParam;              /**< LONG message parameter */
-        } win;
-#endif
-#if defined(SDL_VIDEO_DRIVER_X11)
-        struct {
-            XEvent event;
-        } x11;
-#endif
-#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
-        struct {
-            DFBEvent event;
-        } dfb;
-#endif
-#if defined(SDL_VIDEO_DRIVER_COCOA)
-        struct
-        {
-            /* No Cocoa window events yet */
-        } cocoa;
-#endif
-#if defined(SDL_VIDEO_DRIVER_UIKIT)
-        struct
-        {
-            /* No UIKit window events yet */
-        } uikit;
-#endif
-        /* Can't have an empty union */
-        int dummy;
-    } msg;
-};
-
-/**
- *  The custom window manager information structure.
- *
- *  When this structure is returned, it holds information about which
- *  low level system it is using, and will be one of SDL_SYSWM_TYPE.
- */
-struct SDL_SysWMinfo
-{
-    SDL_version version;
-    SDL_SYSWM_TYPE subsystem;
-    union
-    {
-#if defined(SDL_VIDEO_DRIVER_WINDOWS)
-        struct
-        {
-            HWND window;                /**< The window handle */
-        } win;
-#endif
-#if defined(SDL_VIDEO_DRIVER_WINRT)
-        struct
-        {
-            IInspectable * window;      /**< The WinRT CoreWindow */
-        } winrt;
-#endif
-#if defined(SDL_VIDEO_DRIVER_X11)
-        struct
-        {
-            Display *display;           /**< The X11 display */
-            Window window;              /**< The X11 window */
-        } x11;
-#endif
-#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
-        struct
-        {
-            IDirectFB *dfb;             /**< The directfb main interface */
-            IDirectFBWindow *window;    /**< The directfb window handle */
-            IDirectFBSurface *surface;  /**< The directfb client surface */
-        } dfb;
-#endif
-#if defined(SDL_VIDEO_DRIVER_COCOA)
-        struct
-        {
-            NSWindow *window;           /* The Cocoa window */
-        } cocoa;
-#endif
-#if defined(SDL_VIDEO_DRIVER_UIKIT)
-        struct
-        {
-            UIWindow *window;           /* The UIKit window */
-        } uikit;
-#endif
-#if defined(SDL_VIDEO_DRIVER_WAYLAND)
-        struct
-        {
-            struct wl_display *display;            /**< Wayland display */
-            struct wl_surface *surface;            /**< Wayland surface */
-            struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */
-        } wl;
-#endif
-#if defined(SDL_VIDEO_DRIVER_MIR)
-        struct
-        {
-            MirConnection *connection;  /**< Mir display server connection */
-            MirSurface *surface;  /**< Mir surface */
-        } mir;
-#endif
-
-        /* Can't have an empty union */
-        int dummy;
-    } info;
-};
-
-#endif /* SDL_PROTOTYPES_ONLY */
-
-typedef struct SDL_SysWMinfo SDL_SysWMinfo;
-
-/* Function prototypes */
-/**
- *  \brief This function allows access to driver-dependent window information.
- *
- *  \param window The window about which information is being requested
- *  \param info This structure must be initialized with the SDL version, and is
- *              then filled in with information about the given window.
- *
- *  \return SDL_TRUE if the function is implemented and the version member of
- *          the \c info struct is valid, SDL_FALSE otherwise.
- *
- *  You typically use this function like this:
- *  \code
- *  SDL_SysWMinfo info;
- *  SDL_VERSION(&info.version);
- *  if ( SDL_GetWindowWMInfo(window, &info) ) { ... }
- *  \endcode
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window,
-                                                     SDL_SysWMinfo * info);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_syswm_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test.h b/linux-x86/include/SDL2/SDL_test.h
deleted file mode 100644
index ae649a4..0000000
--- a/linux-x86/include/SDL2/SDL_test.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-#ifndef _SDL_test_h
-#define _SDL_test_h
-
-#include "SDL.h"
-#include "SDL_test_common.h"
-#include "SDL_test_font.h"
-#include "SDL_test_random.h"
-#include "SDL_test_fuzzer.h"
-#include "SDL_test_crc32.h"
-#include "SDL_test_md5.h"
-#include "SDL_test_log.h"
-#include "SDL_test_assert.h"
-#include "SDL_test_harness.h"
-#include "SDL_test_images.h"
-#include "SDL_test_compare.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Global definitions */
-
-/*
- * Note: Maximum size of SDLTest log message is less than SDLs limit
- * to ensure we can fit additional information such as the timestamp.
- */
-#define SDLTEST_MAX_LOGMESSAGE_LENGTH   3584
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_assert.h b/linux-x86/include/SDL2/SDL_test_assert.h
deleted file mode 100644
index 79c84d6..0000000
--- a/linux-x86/include/SDL2/SDL_test_assert.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_assert.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-/*
- *
- * Assert API for test code and test cases
- *
- */
-
-#ifndef _SDL_test_assert_h
-#define _SDL_test_assert_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief Fails the assert.
- */
-#define ASSERT_FAIL     0
-
-/**
- * \brief Passes the assert.
- */
-#define ASSERT_PASS     1
-
-/**
- * \brief Assert that logs and break execution flow on failures.
- *
- * \param assertCondition Evaluated condition or variable to assert; fail (==0) or pass (!=0).
- * \param assertDescription Message to log with the assert describing it.
- */
-void SDLTest_Assert(int assertCondition, const char *assertDescription, ...);
-
-/**
- * \brief Assert for test cases that logs but does not break execution flow on failures. Updates assertion counters.
- *
- * \param assertCondition Evaluated condition or variable to assert; fail (==0) or pass (!=0).
- * \param assertDescription Message to log with the assert describing it.
- *
- * \returns Returns the assertCondition so it can be used to externally to break execution flow if desired.
- */
-int SDLTest_AssertCheck(int assertCondition, const char *assertDescription, ...);
-
-/**
- * \brief Explicitely pass without checking an assertion condition. Updates assertion counter.
- *
- * \param assertDescription Message to log with the assert describing it.
- */
-void SDLTest_AssertPass(const char *assertDescription, ...);
-
-/**
- * \brief Resets the assert summary counters to zero.
- */
-void SDLTest_ResetAssertSummary();
-
-/**
- * \brief Logs summary of all assertions (total, pass, fail) since last reset as INFO or ERROR.
- */
-void SDLTest_LogAssertSummary();
-
-
-/**
- * \brief Converts the current assert summary state to a test result.
- *
- * \returns TEST_RESULT_PASSED, TEST_RESULT_FAILED, or TEST_RESULT_NO_ASSERT
- */
-int SDLTest_AssertSummaryToTestResult();
-
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_assert_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_common.h b/linux-x86/include/SDL2/SDL_test_common.h
deleted file mode 100644
index 45c9eda..0000000
--- a/linux-x86/include/SDL2/SDL_test_common.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_common.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-/* Ported from original test\common.h file. */
-
-#ifndef _SDL_test_common_h
-#define _SDL_test_common_h
-
-#include "SDL.h"
-
-#if defined(__PSP__)
-#define DEFAULT_WINDOW_WIDTH  480
-#define DEFAULT_WINDOW_HEIGHT 272
-#else
-#define DEFAULT_WINDOW_WIDTH  640
-#define DEFAULT_WINDOW_HEIGHT 480
-#endif
-
-#define VERBOSE_VIDEO   0x00000001
-#define VERBOSE_MODES   0x00000002
-#define VERBOSE_RENDER  0x00000004
-#define VERBOSE_EVENT   0x00000008
-#define VERBOSE_AUDIO   0x00000010
-
-typedef struct
-{
-    /* SDL init flags */
-    char **argv;
-    Uint32 flags;
-    Uint32 verbose;
-
-    /* Video info */
-    const char *videodriver;
-    int display;
-    const char *window_title;
-    const char *window_icon;
-    Uint32 window_flags;
-    int window_x;
-    int window_y;
-    int window_w;
-    int window_h;
-    int window_minW;
-    int window_minH;
-    int window_maxW;
-    int window_maxH;
-    int logical_w;
-    int logical_h;
-    float scale;
-    int depth;
-    int refresh_rate;
-    int num_windows;
-    SDL_Window **windows;
-
-    /* Renderer info */
-    const char *renderdriver;
-    Uint32 render_flags;
-    SDL_bool skip_renderer;
-    SDL_Renderer **renderers;
-    SDL_Texture **targets;
-
-    /* Audio info */
-    const char *audiodriver;
-    SDL_AudioSpec audiospec;
-
-    /* GL settings */
-    int gl_red_size;
-    int gl_green_size;
-    int gl_blue_size;
-    int gl_alpha_size;
-    int gl_buffer_size;
-    int gl_depth_size;
-    int gl_stencil_size;
-    int gl_double_buffer;
-    int gl_accum_red_size;
-    int gl_accum_green_size;
-    int gl_accum_blue_size;
-    int gl_accum_alpha_size;
-    int gl_stereo;
-    int gl_multisamplebuffers;
-    int gl_multisamplesamples;
-    int gl_retained_backing;
-    int gl_accelerated;
-    int gl_major_version;
-    int gl_minor_version;
-    int gl_debug;
-    int gl_profile_mask;
-} SDLTest_CommonState;
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Function prototypes */
-
-/**
- * \brief Parse command line parameters and create common state.
- *
- * \param argv Array of command line parameters
- * \param flags Flags indicating which subsystem to initialize (i.e. SDL_INIT_VIDEO | SDL_INIT_AUDIO)
- *
- * \returns Returns a newly allocated common state object.
- */
-SDLTest_CommonState *SDLTest_CommonCreateState(char **argv, Uint32 flags);
-
-/**
- * \brief Process one common argument.
- *
- * \param state The common state describing the test window to create.
- * \param index The index of the argument to process in argv[].
- *
- * \returns The number of arguments processed (i.e. 1 for --fullscreen, 2 for --video [videodriver], or -1 on error.
- */
-int SDLTest_CommonArg(SDLTest_CommonState * state, int index);
-
-/**
- * \brief Returns common usage information
- *
- * \param state The common state describing the test window to create.
- *
- * \returns String with usage information
- */
-const char *SDLTest_CommonUsage(SDLTest_CommonState * state);
-
-/**
- * \brief Open test window.
- *
- * \param state The common state describing the test window to create.
- *
- * \returns True if initialization succeeded, false otherwise
- */
-SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state);
-
-/**
- * \brief Common event handler for test windows.
- *
- * \param state The common state used to create test window.
- * \param event The event to handle.
- * \param done Flag indicating we are done.
- *
- */
-void SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done);
-
-/**
- * \brief Close test window.
- *
- * \param state The common state used to create test window.
- *
- */
-void SDLTest_CommonQuit(SDLTest_CommonState * state);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_common_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_compare.h b/linux-x86/include/SDL2/SDL_test_compare.h
deleted file mode 100644
index f1353a8..0000000
--- a/linux-x86/include/SDL2/SDL_test_compare.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_compare.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-/*
-
- Defines comparison functions (i.e. for surfaces).
-
-*/
-
-#ifndef _SDL_test_compare_h
-#define _SDL_test_compare_h
-
-#include "SDL.h"
-
-#include "SDL_test_images.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief Compares a surface and with reference image data for equality
- *
- * \param surface Surface used in comparison
- * \param referenceSurface Test Surface used in comparison
- * \param allowable_error Allowable difference (squared) in blending accuracy.
- *
- * \returns 0 if comparison succeeded, >0 (=number of pixels where comparison failed) if comparison failed, -1 if any of the surfaces were NULL, -2 if the surface sizes differ.
- */
-int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface, int allowable_error);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_compare_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_crc32.h b/linux-x86/include/SDL2/SDL_test_crc32.h
deleted file mode 100644
index a180fe3..0000000
--- a/linux-x86/include/SDL2/SDL_test_crc32.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_crc32.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-/*
-
- Implements CRC32 calculations (default output is Perl String::CRC32 compatible).
-
-*/
-
-#ifndef _SDL_test_crc32_h
-#define _SDL_test_crc32_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* ------------ Definitions --------- */
-
-/* Definition shared by all CRC routines */
-
-#ifndef CrcUint32
- #define CrcUint32  unsigned int
-#endif
-#ifndef CrcUint8
- #define CrcUint8   unsigned char
-#endif
-
-#ifdef ORIGINAL_METHOD
- #define CRC32_POLY 0x04c11db7   /* AUTODIN II, Ethernet, & FDDI */
-#else
- #define CRC32_POLY 0xEDB88320   /* Perl String::CRC32 compatible */
-#endif
-
-/**
- * Data structure for CRC32 (checksum) computation
- */
-  typedef struct {
-    CrcUint32    crc32_table[256]; /* CRC table */
-  } SDLTest_Crc32Context;
-
-/* ---------- Function Prototypes ------------- */
-
-/**
- * /brief Initialize the CRC context
- *
- * Note: The function initializes the crc table required for all crc calculations.
- *
- * /param crcContext        pointer to context variable
- *
- * /returns 0 for OK, -1 on error
- *
- */
- int SDLTest_Crc32Init(SDLTest_Crc32Context * crcContext);
-
-
-/**
- * /brief calculate a crc32 from a data block
- *
- * /param crcContext         pointer to context variable
- * /param inBuf              input buffer to checksum
- * /param inLen              length of input buffer
- * /param crc32              pointer to Uint32 to store the final CRC into
- *
- * /returns 0 for OK, -1 on error
- *
- */
-int SDLTest_crc32Calc(SDLTest_Crc32Context * crcContext, CrcUint8 *inBuf, CrcUint32 inLen, CrcUint32 *crc32);
-
-/* Same routine broken down into three steps */
-int SDLTest_Crc32CalcStart(SDLTest_Crc32Context * crcContext, CrcUint32 *crc32);
-int SDLTest_Crc32CalcEnd(SDLTest_Crc32Context * crcContext, CrcUint32 *crc32);
-int SDLTest_Crc32CalcBuffer(SDLTest_Crc32Context * crcContext, CrcUint8 *inBuf, CrcUint32 inLen, CrcUint32 *crc32);
-
-
-/**
- * /brief clean up CRC context
- *
- * /param crcContext        pointer to context variable
- *
- * /returns 0 for OK, -1 on error
- *
-*/
-
-int SDLTest_Crc32Done(SDLTest_Crc32Context * crcContext);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_crc32_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_font.h b/linux-x86/include/SDL2/SDL_test_font.h
deleted file mode 100644
index 8d51d4a..0000000
--- a/linux-x86/include/SDL2/SDL_test_font.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_font.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-#ifndef _SDL_test_font_h
-#define _SDL_test_font_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Function prototypes */
-
-#define FONT_CHARACTER_SIZE  8
-
-/**
- *  \brief Draw a string in the currently set font.
- *
- *  \param renderer The renderer to draw on.
- *  \param x The X coordinate of the upper left corner of the character.
- *  \param y The Y coordinate of the upper left corner of the character.
- *  \param c The character to draw.
- *
- *  \returns Returns 0 on success, -1 on failure.
- */
-int SDLTest_DrawCharacter( SDL_Renderer *renderer, int x, int y, char c );
-
-/**
- *  \brief Draw a string in the currently set font.
- *
- *  \param renderer The renderer to draw on.
- *  \param x The X coordinate of the upper left corner of the string.
- *  \param y The Y coordinate of the upper left corner of the string.
- *  \param s The string to draw.
- *
- *  \returns Returns 0 on success, -1 on failure.
- */
-int SDLTest_DrawString( SDL_Renderer * renderer, int x, int y, const char *s );
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_font_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_fuzzer.h b/linux-x86/include/SDL2/SDL_test_fuzzer.h
deleted file mode 100644
index 6401803..0000000
--- a/linux-x86/include/SDL2/SDL_test_fuzzer.h
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_fuzzer.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-/*
-
-  Data generators for fuzzing test data in a reproducible way.
-
-*/
-
-#ifndef _SDL_test_fuzzer_h
-#define _SDL_test_fuzzer_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
-  Based on GSOC code by Markus Kauppila <markus.kauppila@gmail.com>
-*/
-
-
-/**
- * \file
- * Note: The fuzzer implementation uses a static instance of random context
- * internally which makes it thread-UNsafe.
- */
-
-/**
- * Initializes the fuzzer for a test
- *
- * /param execKey Execution "Key" that initializes the random number generator uniquely for the test.
- *
- */
-void SDLTest_FuzzerInit(Uint64 execKey);
-
-
-/**
- * Returns a random Uint8
- *
- * \returns Generated integer
- */
-Uint8 SDLTest_RandomUint8();
-
-/**
- * Returns a random Sint8
- *
- * \returns Generated signed integer
- */
-Sint8 SDLTest_RandomSint8();
-
-
-/**
- * Returns a random Uint16
- *
- * \returns Generated integer
- */
-Uint16 SDLTest_RandomUint16();
-
-/**
- * Returns a random Sint16
- *
- * \returns Generated signed integer
- */
-Sint16 SDLTest_RandomSint16();
-
-
-/**
- * Returns a random integer
- *
- * \returns Generated integer
- */
-Sint32 SDLTest_RandomSint32();
-
-
-/**
- * Returns a random positive integer
- *
- * \returns Generated integer
- */
-Uint32 SDLTest_RandomUint32();
-
-/**
- * Returns random Uint64.
- *
- * \returns Generated integer
- */
-Uint64 SDLTest_RandomUint64();
-
-
-/**
- * Returns random Sint64.
- *
- * \returns Generated signed integer
- */
-Sint64 SDLTest_RandomSint64();
-
-/**
- * \returns random float in range [0.0 - 1.0[
- */
-float SDLTest_RandomUnitFloat();
-
-/**
- * \returns random double in range [0.0 - 1.0[
- */
-double SDLTest_RandomUnitDouble();
-
-/**
- * \returns random float.
- *
- */
-float SDLTest_RandomFloat();
-
-/**
- * \returns random double.
- *
- */
-double SDLTest_RandomDouble();
-
-/**
- * Returns a random boundary value for Uint8 within the given boundaries.
- * Boundaries are inclusive, see the usage examples below. If validDomain
- * is true, the function will only return valid boundaries, otherwise non-valid
- * boundaries are also possible.
- * If boundary1 > boundary2, the values are swapped
- *
- * Usage examples:
- * RandomUint8BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
- * RandomUint8BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
- * RandomUint8BoundaryValue(0, 99, SDL_FALSE) returns 100
- * RandomUint8BoundaryValue(0, 255, SDL_FALSE) returns 0 (error set)
- *
- * \param boundary1 Lower boundary limit
- * \param boundary2 Upper boundary limit
- * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
- *
- * \returns Random boundary value for the given range and domain or 0 with error set
- */
-Uint8 SDLTest_RandomUint8BoundaryValue(Uint8 boundary1, Uint8 boundary2, SDL_bool validDomain);
-
-/**
- * Returns a random boundary value for Uint16 within the given boundaries.
- * Boundaries are inclusive, see the usage examples below. If validDomain
- * is true, the function will only return valid boundaries, otherwise non-valid
- * boundaries are also possible.
- * If boundary1 > boundary2, the values are swapped
- *
- * Usage examples:
- * RandomUint16BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
- * RandomUint16BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
- * RandomUint16BoundaryValue(0, 99, SDL_FALSE) returns 100
- * RandomUint16BoundaryValue(0, 0xFFFF, SDL_FALSE) returns 0 (error set)
- *
- * \param boundary1 Lower boundary limit
- * \param boundary2 Upper boundary limit
- * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
- *
- * \returns Random boundary value for the given range and domain or 0 with error set
- */
-Uint16 SDLTest_RandomUint16BoundaryValue(Uint16 boundary1, Uint16 boundary2, SDL_bool validDomain);
-
-/**
- * Returns a random boundary value for Uint32 within the given boundaries.
- * Boundaries are inclusive, see the usage examples below. If validDomain
- * is true, the function will only return valid boundaries, otherwise non-valid
- * boundaries are also possible.
- * If boundary1 > boundary2, the values are swapped
- *
- * Usage examples:
- * RandomUint32BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
- * RandomUint32BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
- * RandomUint32BoundaryValue(0, 99, SDL_FALSE) returns 100
- * RandomUint32BoundaryValue(0, 0xFFFFFFFF, SDL_FALSE) returns 0 (with error set)
- *
- * \param boundary1 Lower boundary limit
- * \param boundary2 Upper boundary limit
- * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
- *
- * \returns Random boundary value for the given range and domain or 0 with error set
- */
-Uint32 SDLTest_RandomUint32BoundaryValue(Uint32 boundary1, Uint32 boundary2, SDL_bool validDomain);
-
-/**
- * Returns a random boundary value for Uint64 within the given boundaries.
- * Boundaries are inclusive, see the usage examples below. If validDomain
- * is true, the function will only return valid boundaries, otherwise non-valid
- * boundaries are also possible.
- * If boundary1 > boundary2, the values are swapped
- *
- * Usage examples:
- * RandomUint64BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
- * RandomUint64BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
- * RandomUint64BoundaryValue(0, 99, SDL_FALSE) returns 100
- * RandomUint64BoundaryValue(0, 0xFFFFFFFFFFFFFFFF, SDL_FALSE) returns 0 (with error set)
- *
- * \param boundary1 Lower boundary limit
- * \param boundary2 Upper boundary limit
- * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
- *
- * \returns Random boundary value for the given range and domain or 0 with error set
- */
-Uint64 SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL_bool validDomain);
-
-/**
- * Returns a random boundary value for Sint8 within the given boundaries.
- * Boundaries are inclusive, see the usage examples below. If validDomain
- * is true, the function will only return valid boundaries, otherwise non-valid
- * boundaries are also possible.
- * If boundary1 > boundary2, the values are swapped
- *
- * Usage examples:
- * RandomSint8BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
- * RandomSint8BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
- * RandomSint8BoundaryValue(SINT8_MIN, 99, SDL_FALSE) returns 100
- * RandomSint8BoundaryValue(SINT8_MIN, SINT8_MAX, SDL_FALSE) returns SINT8_MIN (== error value) with error set
- *
- * \param boundary1 Lower boundary limit
- * \param boundary2 Upper boundary limit
- * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
- *
- * \returns Random boundary value for the given range and domain or SINT8_MIN with error set
- */
-Sint8 SDLTest_RandomSint8BoundaryValue(Sint8 boundary1, Sint8 boundary2, SDL_bool validDomain);
-
-
-/**
- * Returns a random boundary value for Sint16 within the given boundaries.
- * Boundaries are inclusive, see the usage examples below. If validDomain
- * is true, the function will only return valid boundaries, otherwise non-valid
- * boundaries are also possible.
- * If boundary1 > boundary2, the values are swapped
- *
- * Usage examples:
- * RandomSint16BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
- * RandomSint16BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
- * RandomSint16BoundaryValue(SINT16_MIN, 99, SDL_FALSE) returns 100
- * RandomSint16BoundaryValue(SINT16_MIN, SINT16_MAX, SDL_FALSE) returns SINT16_MIN (== error value) with error set
- *
- * \param boundary1 Lower boundary limit
- * \param boundary2 Upper boundary limit
- * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
- *
- * \returns Random boundary value for the given range and domain or SINT16_MIN with error set
- */
-Sint16 SDLTest_RandomSint16BoundaryValue(Sint16 boundary1, Sint16 boundary2, SDL_bool validDomain);
-
-/**
- * Returns a random boundary value for Sint32 within the given boundaries.
- * Boundaries are inclusive, see the usage examples below. If validDomain
- * is true, the function will only return valid boundaries, otherwise non-valid
- * boundaries are also possible.
- * If boundary1 > boundary2, the values are swapped
- *
- * Usage examples:
- * RandomSint32BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
- * RandomSint32BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
- * RandomSint32BoundaryValue(SINT32_MIN, 99, SDL_FALSE) returns 100
- * RandomSint32BoundaryValue(SINT32_MIN, SINT32_MAX, SDL_FALSE) returns SINT32_MIN (== error value)
- *
- * \param boundary1 Lower boundary limit
- * \param boundary2 Upper boundary limit
- * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
- *
- * \returns Random boundary value for the given range and domain or SINT32_MIN with error set
- */
-Sint32 SDLTest_RandomSint32BoundaryValue(Sint32 boundary1, Sint32 boundary2, SDL_bool validDomain);
-
-/**
- * Returns a random boundary value for Sint64 within the given boundaries.
- * Boundaries are inclusive, see the usage examples below. If validDomain
- * is true, the function will only return valid boundaries, otherwise non-valid
- * boundaries are also possible.
- * If boundary1 > boundary2, the values are swapped
- *
- * Usage examples:
- * RandomSint64BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
- * RandomSint64BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
- * RandomSint64BoundaryValue(SINT64_MIN, 99, SDL_FALSE) returns 100
- * RandomSint64BoundaryValue(SINT64_MIN, SINT64_MAX, SDL_FALSE) returns SINT64_MIN (== error value) and error set
- *
- * \param boundary1 Lower boundary limit
- * \param boundary2 Upper boundary limit
- * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
- *
- * \returns Random boundary value for the given range and domain or SINT64_MIN with error set
- */
-Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL_bool validDomain);
-
-
-/**
- * Returns integer in range [min, max] (inclusive).
- * Min and max values can be negative values.
- * If Max in smaller tham min, then the values are swapped.
- * Min and max are the same value, that value will be returned.
- *
- * \param min Minimum inclusive value of returned random number
- * \param max Maximum inclusive value of returned random number
- *
- * \returns Generated random integer in range
- */
-Sint32 SDLTest_RandomIntegerInRange(Sint32 min, Sint32 max);
-
-
-/**
- * Generates random null-terminated string. The minimum length for
- * the string is 1 character, maximum length for the string is 255
- * characters and it can contain ASCII characters from 32 to 126.
- *
- * Note: Returned string needs to be deallocated.
- *
- * \returns Newly allocated random string; or NULL if length was invalid or string could not be allocated.
- */
-char * SDLTest_RandomAsciiString();
-
-
-/**
- * Generates random null-terminated string. The maximum length for
- * the string is defined by the maxLength parameter.
- * String can contain ASCII characters from 32 to 126.
- *
- * Note: Returned string needs to be deallocated.
- *
- * \param maxLength The maximum length of the generated string.
- *
- * \returns Newly allocated random string; or NULL if maxLength was invalid or string could not be allocated.
- */
-char * SDLTest_RandomAsciiStringWithMaximumLength(int maxLength);
-
-
-/**
- * Generates random null-terminated string. The length for
- * the string is defined by the size parameter.
- * String can contain ASCII characters from 32 to 126.
- *
- * Note: Returned string needs to be deallocated.
- *
- * \param size The length of the generated string
- *
- * \returns Newly allocated random string; or NULL if size was invalid or string could not be allocated.
- */
-char * SDLTest_RandomAsciiStringOfSize(int size);
-
-/**
- * Returns the invocation count for the fuzzer since last ...FuzzerInit.
- */
-int SDLTest_GetFuzzerInvocationCount();
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_fuzzer_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_harness.h b/linux-x86/include/SDL2/SDL_test_harness.h
deleted file mode 100644
index 2c1e2ad..0000000
--- a/linux-x86/include/SDL2/SDL_test_harness.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_harness.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-/*
-  Defines types for test case definitions and the test execution harness API.
-
-  Based on original GSOC code by Markus Kauppila <markus.kauppila@gmail.com>
-*/
-
-#ifndef _SDL_test_harness_h
-#define _SDL_test_harness_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* ! Definitions for test case structures */
-#define TEST_ENABLED  1
-#define TEST_DISABLED 0
-
-/* ! Definition of all the possible test return values of the test case method */
-#define TEST_ABORTED        -1
-#define TEST_STARTED         0
-#define TEST_COMPLETED       1
-#define TEST_SKIPPED         2
-
-/* ! Definition of all the possible test results for the harness */
-#define TEST_RESULT_PASSED              0
-#define TEST_RESULT_FAILED              1
-#define TEST_RESULT_NO_ASSERT           2
-#define TEST_RESULT_SKIPPED             3
-#define TEST_RESULT_SETUP_FAILURE       4
-
-/* !< Function pointer to a test case setup function (run before every test) */
-typedef void (*SDLTest_TestCaseSetUpFp)(void *arg);
-
-/* !< Function pointer to a test case function */
-typedef int (*SDLTest_TestCaseFp)(void *arg);
-
-/* !< Function pointer to a test case teardown function (run after every test) */
-typedef void  (*SDLTest_TestCaseTearDownFp)(void *arg);
-
-/**
- * Holds information about a single test case.
- */
-typedef struct SDLTest_TestCaseReference {
-    /* !< Func2Stress */
-    SDLTest_TestCaseFp testCase;
-    /* !< Short name (or function name) "Func2Stress" */
-    char *name;
-    /* !< Long name or full description "This test pushes func2() to the limit." */
-    char *description;
-    /* !< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */
-    int enabled;
-} SDLTest_TestCaseReference;
-
-/**
- * Holds information about a test suite (multiple test cases).
- */
-typedef struct SDLTest_TestSuiteReference {
-    /* !< "PlatformSuite" */
-    char *name;
-    /* !< The function that is run before each test. NULL skips. */
-    SDLTest_TestCaseSetUpFp testSetUp;
-    /* !< The test cases that are run as part of the suite. Last item should be NULL. */
-    const SDLTest_TestCaseReference **testCases;
-    /* !< The function that is run after each test. NULL skips. */
-    SDLTest_TestCaseTearDownFp testTearDown;
-} SDLTest_TestSuiteReference;
-
-
-/**
- * \brief Execute a test suite using the given run seed and execution key.
- *
- * \param testSuites Suites containing the test case.
- * \param userRunSeed Custom run seed provided by user, or NULL to autogenerate one.
- * \param userExecKey Custom execution key provided by user, or 0 to autogenerate one.
- * \param filter Filter specification. NULL disables. Case sensitive.
- * \param testIterations Number of iterations to run each test case.
- *
- * \returns Test run result; 0 when all tests passed, 1 if any tests failed.
- */
-int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *userRunSeed, Uint64 userExecKey, const char *filter, int testIterations);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_harness_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_images.h b/linux-x86/include/SDL2/SDL_test_images.h
deleted file mode 100644
index 0562799..0000000
--- a/linux-x86/include/SDL2/SDL_test_images.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_images.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-/*
-
- Defines some images for tests.
-
-*/
-
-#ifndef _SDL_test_images_h
-#define _SDL_test_images_h
-
-#include "SDL.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *Type for test images.
- */
-typedef struct SDLTest_SurfaceImage_s {
-  int width;
-  int height;
-  unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */
-  const char *pixel_data;
-} SDLTest_SurfaceImage_t;
-
-/* Test images */
-SDL_Surface *SDLTest_ImageBlit();
-SDL_Surface *SDLTest_ImageBlitColor();
-SDL_Surface *SDLTest_ImageBlitAlpha();
-SDL_Surface *SDLTest_ImageBlitBlendAdd();
-SDL_Surface *SDLTest_ImageBlitBlend();
-SDL_Surface *SDLTest_ImageBlitBlendMod();
-SDL_Surface *SDLTest_ImageBlitBlendNone();
-SDL_Surface *SDLTest_ImageBlitBlendAll();
-SDL_Surface *SDLTest_ImageFace();
-SDL_Surface *SDLTest_ImagePrimitives();
-SDL_Surface *SDLTest_ImagePrimitivesBlend();
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_images_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_log.h b/linux-x86/include/SDL2/SDL_test_log.h
deleted file mode 100644
index 76ce105..0000000
--- a/linux-x86/include/SDL2/SDL_test_log.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_log.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-/*
- *
- *  Wrapper to log in the TEST category
- *
- */
-
-#ifndef _SDL_test_log_h
-#define _SDL_test_log_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief Prints given message with a timestamp in the TEST category and INFO priority.
- *
- * \param fmt Message to be logged
- */
-void SDLTest_Log(const char *fmt, ...);
-
-/**
- * \brief Prints given message with a timestamp in the TEST category and the ERROR priority.
- *
- * \param fmt Message to be logged
- */
-void SDLTest_LogError(const char *fmt, ...);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_log_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_md5.h b/linux-x86/include/SDL2/SDL_test_md5.h
deleted file mode 100644
index 029e164..0000000
--- a/linux-x86/include/SDL2/SDL_test_md5.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_md5.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-/*
- ***********************************************************************
- ** Header file for implementation of MD5                             **
- ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
- ** Created: 2/17/90 RLR                                              **
- ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version               **
- ** Revised (for MD5): RLR 4/27/91                                    **
- **   -- G modified to have y&~z instead of y&z                       **
- **   -- FF, GG, HH modified to add in last register done             **
- **   -- Access pattern: round 2 works mod 5, round 3 works mod 3     **
- **   -- distinct additive constant for each step                     **
- **   -- round 4 added, working mod 7                                 **
- ***********************************************************************
-*/
-
-/*
- ***********************************************************************
- **  Message-digest routines:                                         **
- **  To form the message digest for a message M                       **
- **    (1) Initialize a context buffer mdContext using MD5Init        **
- **    (2) Call MD5Update on mdContext and M                          **
- **    (3) Call MD5Final on mdContext                                 **
- **  The message digest is now in mdContext->digest[0...15]           **
- ***********************************************************************
-*/
-
-#ifndef _SDL_test_md5_h
-#define _SDL_test_md5_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------ Definitions --------- */
-
-/* typedef a 32-bit type */
-  typedef unsigned long int MD5UINT4;
-
-/* Data structure for MD5 (Message-Digest) computation */
-  typedef struct {
-    MD5UINT4  i[2];     /* number of _bits_ handled mod 2^64 */
-    MD5UINT4  buf[4];       /* scratch buffer */
-    unsigned char in[64];   /* input buffer */
-    unsigned char digest[16];   /* actual digest after Md5Final call */
-  } SDLTest_Md5Context;
-
-/* ---------- Function Prototypes ------------- */
-
-/**
- * /brief initialize the context
- *
- * /param  mdContext        pointer to context variable
- *
- * Note: The function initializes the message-digest context
- *       mdContext. Call before each new use of the context -
- *       all fields are set to zero.
- */
- void SDLTest_Md5Init(SDLTest_Md5Context * mdContext);
-
-
-/**
- * /brief update digest from variable length data
- *
- * /param  mdContext       pointer to context variable
- * /param  inBuf           pointer to data array/string
- * /param  inLen           length of data array/string
- *
- * Note: The function updates the message-digest context to account
- *       for the presence of each of the characters inBuf[0..inLen-1]
- *       in the message whose digest is being computed.
-*/
-
- void SDLTest_Md5Update(SDLTest_Md5Context * mdContext, unsigned char *inBuf,
-                 unsigned int inLen);
-
-
-/*
- * /brief complete digest computation
- *
- * /param mdContext     pointer to context variable
- *
- * Note: The function terminates the message-digest computation and
- *       ends with the desired message digest in mdContext.digest[0..15].
- *       Always call before using the digest[] variable.
-*/
-
- void SDLTest_Md5Final(SDLTest_Md5Context * mdContext);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_md5_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_test_random.h b/linux-x86/include/SDL2/SDL_test_random.h
deleted file mode 100644
index 6c5660d..0000000
--- a/linux-x86/include/SDL2/SDL_test_random.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_test_random.h
- *
- *  Include file for SDL test framework.
- *
- *  This code is a part of the SDL2_test library, not the main SDL library.
- */
-
-/*
-
- A "32-bit Multiply with carry random number generator. Very fast.
- Includes a list of recommended multipliers.
-
- multiply-with-carry generator: x(n) = a*x(n-1) + carry mod 2^32.
- period: (a*2^31)-1
-
-*/
-
-#ifndef _SDL_test_random_h
-#define _SDL_test_random_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* --- Definitions */
-
-/*
- * Macros that return a random number in a specific format.
- */
-#define SDLTest_RandomInt(c)        ((int)SDLTest_Random(c))
-
-/*
- * Context structure for the random number generator state.
- */
-  typedef struct {
-    unsigned int a;
-    unsigned int x;
-    unsigned int c;
-    unsigned int ah;
-    unsigned int al;
-  } SDLTest_RandomContext;
-
-
-/* --- Function prototypes */
-
-/**
- *  \brief Initialize random number generator with two integers.
- *
- *  Note: The random sequence of numbers returned by ...Random() is the
- *  same for the same two integers and has a period of 2^31.
- *
- *  \param rndContext     pointer to context structure
- *  \param xi         integer that defines the random sequence
- *  \param ci         integer that defines the random sequence
- *
- */
- void SDLTest_RandomInit(SDLTest_RandomContext * rndContext, unsigned int xi,
-                  unsigned int ci);
-
-/**
- *  \brief Initialize random number generator based on current system time.
- *
- *  \param rndContext     pointer to context structure
- *
- */
- void SDLTest_RandomInitTime(SDLTest_RandomContext *rndContext);
-
-
-/**
- *  \brief Initialize random number generator based on current system time.
- *
- *  Note: ...RandomInit() or ...RandomInitTime() must have been called
- *  before using this function.
- *
- *  \param rndContext     pointer to context structure
- *
- *  \returns A random number (32bit unsigned integer)
- *
- */
- unsigned int SDLTest_Random(SDLTest_RandomContext *rndContext);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_test_random_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_thread.h b/linux-x86/include/SDL2/SDL_thread.h
deleted file mode 100644
index 4e48cc3..0000000
--- a/linux-x86/include/SDL2/SDL_thread.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_thread_h
-#define _SDL_thread_h
-
-/**
- *  \file SDL_thread.h
- *
- *  Header for the SDL thread management routines.
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-/* Thread synchronization primitives */
-#include "SDL_atomic.h"
-#include "SDL_mutex.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The SDL thread structure, defined in SDL_thread.c */
-struct SDL_Thread;
-typedef struct SDL_Thread SDL_Thread;
-
-/* The SDL thread ID */
-typedef unsigned long SDL_threadID;
-
-/* Thread local storage ID, 0 is the invalid ID */
-typedef unsigned int SDL_TLSID;
-
-/**
- *  The SDL thread priority.
- *
- *  \note On many systems you require special privileges to set high priority.
- */
-typedef enum {
-    SDL_THREAD_PRIORITY_LOW,
-    SDL_THREAD_PRIORITY_NORMAL,
-    SDL_THREAD_PRIORITY_HIGH
-} SDL_ThreadPriority;
-
-/**
- *  The function passed to SDL_CreateThread().
- *  It is passed a void* user context parameter and returns an int.
- */
-typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
-
-#if defined(__WIN32__) && !defined(HAVE_LIBC)
-/**
- *  \file SDL_thread.h
- *
- *  We compile SDL into a DLL. This means, that it's the DLL which
- *  creates a new thread for the calling process with the SDL_CreateThread()
- *  API. There is a problem with this, that only the RTL of the SDL.DLL will
- *  be initialized for those threads, and not the RTL of the calling
- *  application!
- *
- *  To solve this, we make a little hack here.
- *
- *  We'll always use the caller's _beginthread() and _endthread() APIs to
- *  start a new thread. This way, if it's the SDL.DLL which uses this API,
- *  then the RTL of SDL.DLL will be used to create the new thread, and if it's
- *  the application, then the RTL of the application will be used.
- *
- *  So, in short:
- *  Always use the _beginthread() and _endthread() of the calling runtime
- *  library!
- */
-#define SDL_PASSED_BEGINTHREAD_ENDTHREAD
-#include <process.h>            /* This has _beginthread() and _endthread() defined! */
-
-typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
-                                                        unsigned (__stdcall *
-                                                                  func) (void
-                                                                         *),
-                                                        void *arg, unsigned,
-                                                        unsigned *threadID);
-typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code);
-
-/**
- *  Create a thread.
- */
-extern DECLSPEC SDL_Thread *SDLCALL
-SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data,
-                 pfnSDL_CurrentBeginThread pfnBeginThread,
-                 pfnSDL_CurrentEndThread pfnEndThread);
-
-/**
- *  Create a thread.
- */
-#if defined(SDL_CreateThread) && SDL_DYNAMIC_API
-#undef SDL_CreateThread
-#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex)
-#else
-#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex)
-#endif
-
-#else
-
-/**
- *  Create a thread.
- *
- *   Thread naming is a little complicated: Most systems have very small
- *    limits for the string length (Haiku has 32 bytes, Linux currently has 16,
- *    Visual C++ 6.0 has nine!), and possibly other arbitrary rules. You'll
- *    have to see what happens with your system's debugger. The name should be
- *    UTF-8 (but using the naming limits of C identifiers is a better bet).
- *   There are no requirements for thread naming conventions, so long as the
- *    string is null-terminated UTF-8, but these guidelines are helpful in
- *    choosing a name:
- *
- *    http://stackoverflow.com/questions/149932/naming-conventions-for-threads
- *
- *   If a system imposes requirements, SDL will try to munge the string for
- *    it (truncate, etc), but the original string contents will be available
- *    from SDL_GetThreadName().
- */
-extern DECLSPEC SDL_Thread *SDLCALL
-SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data);
-
-#endif
-
-/**
- * Get the thread name, as it was specified in SDL_CreateThread().
- *  This function returns a pointer to a UTF-8 string that names the
- *  specified thread, or NULL if it doesn't have a name. This is internal
- *  memory, not to be free()'d by the caller, and remains valid until the
- *  specified thread is cleaned up by SDL_WaitThread().
- */
-extern DECLSPEC const char *SDLCALL SDL_GetThreadName(SDL_Thread *thread);
-
-/**
- *  Get the thread identifier for the current thread.
- */
-extern DECLSPEC SDL_threadID SDLCALL SDL_ThreadID(void);
-
-/**
- *  Get the thread identifier for the specified thread.
- *
- *  Equivalent to SDL_ThreadID() if the specified thread is NULL.
- */
-extern DECLSPEC SDL_threadID SDLCALL SDL_GetThreadID(SDL_Thread * thread);
-
-/**
- *  Set the priority for the current thread
- */
-extern DECLSPEC int SDLCALL SDL_SetThreadPriority(SDL_ThreadPriority priority);
-
-/**
- *  Wait for a thread to finish. Threads that haven't been detached will
- *  remain (as a "zombie") until this function cleans them up. Not doing so
- *  is a resource leak.
- *
- *  Once a thread has been cleaned up through this function, the SDL_Thread
- *  that references it becomes invalid and should not be referenced again.
- *  As such, only one thread may call SDL_WaitThread() on another.
- *
- *  The return code for the thread function is placed in the area
- *  pointed to by \c status, if \c status is not NULL.
- *
- *  You may not wait on a thread that has been used in a call to
- *  SDL_DetachThread(). Use either that function or this one, but not
- *  both, or behavior is undefined.
- *
- *  It is safe to pass NULL to this function; it is a no-op.
- */
-extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status);
-
-/**
- *  A thread may be "detached" to signify that it should not remain until
- *  another thread has called SDL_WaitThread() on it. Detaching a thread
- *  is useful for long-running threads that nothing needs to synchronize
- *  with or further manage. When a detached thread is done, it simply
- *  goes away.
- *
- *  There is no way to recover the return code of a detached thread. If you
- *  need this, don't detach the thread and instead use SDL_WaitThread().
- *
- *  Once a thread is detached, you should usually assume the SDL_Thread isn't
- *  safe to reference again, as it will become invalid immediately upon
- *  the detached thread's exit, instead of remaining until someone has called
- *  SDL_WaitThread() to finally clean it up. As such, don't detach the same
- *  thread more than once.
- *
- *  If a thread has already exited when passed to SDL_DetachThread(), it will
- *  stop waiting for a call to SDL_WaitThread() and clean up immediately.
- *  It is not safe to detach a thread that might be used with SDL_WaitThread().
- *
- *  You may not call SDL_WaitThread() on a thread that has been detached.
- *  Use either that function or this one, but not both, or behavior is
- *  undefined.
- *
- *  It is safe to pass NULL to this function; it is a no-op.
- */
-extern DECLSPEC void SDLCALL SDL_DetachThread(SDL_Thread * thread);
-
-/**
- *  \brief Create an identifier that is globally visible to all threads but refers to data that is thread-specific.
- *
- *  \return The newly created thread local storage identifier, or 0 on error
- *
- *  \code
- *  static SDL_SpinLock tls_lock;
- *  static SDL_TLSID thread_local_storage;
- * 
- *  void SetMyThreadData(void *value)
- *  {
- *      if (!thread_local_storage) {
- *          SDL_AtomicLock(&tls_lock);
- *          if (!thread_local_storage) {
- *              thread_local_storage = SDL_TLSCreate();
- *          }
- *          SDL_AtomicUnLock(&tls_lock);
- *      }
- *      SDL_TLSSet(thread_local_storage, value);
- *  }
- *  
- *  void *GetMyThreadData(void)
- *  {
- *      return SDL_TLSGet(thread_local_storage);
- *  }
- *  \endcode
- *
- *  \sa SDL_TLSGet()
- *  \sa SDL_TLSSet()
- */
-extern DECLSPEC SDL_TLSID SDLCALL SDL_TLSCreate(void);
-
-/**
- *  \brief Get the value associated with a thread local storage ID for the current thread.
- *
- *  \param id The thread local storage ID
- *
- *  \return The value associated with the ID for the current thread, or NULL if no value has been set.
- *
- *  \sa SDL_TLSCreate()
- *  \sa SDL_TLSSet()
- */
-extern DECLSPEC void * SDLCALL SDL_TLSGet(SDL_TLSID id);
-
-/**
- *  \brief Set the value associated with a thread local storage ID for the current thread.
- *
- *  \param id The thread local storage ID
- *  \param value The value to associate with the ID for the current thread
- *  \param destructor A function called when the thread exits, to free the value.
- *
- *  \return 0 on success, -1 on error
- *
- *  \sa SDL_TLSCreate()
- *  \sa SDL_TLSGet()
- */
-extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (*destructor)(void*));
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_thread_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_timer.h b/linux-x86/include/SDL2/SDL_timer.h
deleted file mode 100644
index a48e046..0000000
--- a/linux-x86/include/SDL2/SDL_timer.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_timer_h
-#define _SDL_timer_h
-
-/**
- *  \file SDL_timer.h
- *
- *  Header for the SDL time management routines.
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief Get the number of milliseconds since the SDL library initialization.
- *
- * \note This value wraps if the program runs for more than ~49 days.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void);
-
-/**
- * \brief Compare SDL ticks values, and return true if A has passed B
- *
- * e.g. if you want to wait 100 ms, you could do this:
- *  Uint32 timeout = SDL_GetTicks() + 100;
- *  while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) {
- *      ... do work until timeout has elapsed
- *  }
- */
-#define SDL_TICKS_PASSED(A, B)  ((Sint32)((B) - (A)) <= 0)
-
-/**
- * \brief Get the current value of the high resolution counter
- */
-extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceCounter(void);
-
-/**
- * \brief Get the count per second of the high resolution counter
- */
-extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceFrequency(void);
-
-/**
- * \brief Wait a specified number of milliseconds before returning.
- */
-extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);
-
-/**
- *  Function prototype for the timer callback function.
- *
- *  The callback function is passed the current timer interval and returns
- *  the next timer interval.  If the returned value is the same as the one
- *  passed in, the periodic alarm continues, otherwise a new alarm is
- *  scheduled.  If the callback returns 0, the periodic alarm is cancelled.
- */
-typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param);
-
-/**
- * Definition of the timer ID type.
- */
-typedef int SDL_TimerID;
-
-/**
- * \brief Add a new timer to the pool of timers already running.
- *
- * \return A timer ID, or NULL when an error occurs.
- */
-extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval,
-                                                 SDL_TimerCallback callback,
-                                                 void *param);
-
-/**
- * \brief Remove a timer knowing its ID.
- *
- * \return A boolean value indicating success or failure.
- *
- * \warning It is not safe to remove a timer multiple times.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_timer_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_touch.h b/linux-x86/include/SDL2/SDL_touch.h
deleted file mode 100644
index 017deb2..0000000
--- a/linux-x86/include/SDL2/SDL_touch.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_touch.h
- *
- *  Include file for SDL touch event handling.
- */
-
-#ifndef _SDL_touch_h
-#define _SDL_touch_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef Sint64 SDL_TouchID;
-typedef Sint64 SDL_FingerID;
-
-typedef struct SDL_Finger
-{
-    SDL_FingerID id;
-    float x;
-    float y;
-    float pressure;
-} SDL_Finger;
-
-/* Used as the device ID for mouse events simulated with touch input */
-#define SDL_TOUCH_MOUSEID ((Uint32)-1)
-
-
-/* Function prototypes */
-
-/**
- *  \brief Get the number of registered touch devices.
- */
-extern DECLSPEC int SDLCALL SDL_GetNumTouchDevices(void);
-
-/**
- *  \brief Get the touch ID with the given index, or 0 if the index is invalid.
- */
-extern DECLSPEC SDL_TouchID SDLCALL SDL_GetTouchDevice(int index);
-
-/**
- *  \brief Get the number of active fingers for a given touch device.
- */
-extern DECLSPEC int SDLCALL SDL_GetNumTouchFingers(SDL_TouchID touchID);
-
-/**
- *  \brief Get the finger object of the given touch, with the given index.
- */
-extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int index);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_touch_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_types.h b/linux-x86/include/SDL2/SDL_types.h
deleted file mode 100644
index cd3ba33..0000000
--- a/linux-x86/include/SDL2/SDL_types.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_types.h
- *
- *  \deprecated
- */
-
-/* DEPRECATED */
-#include "SDL_stdinc.h"
diff --git a/linux-x86/include/SDL2/SDL_version.h b/linux-x86/include/SDL2/SDL_version.h
deleted file mode 100644
index d02898b..0000000
--- a/linux-x86/include/SDL2/SDL_version.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_version.h
- *
- *  This header defines the current SDL version.
- */
-
-#ifndef _SDL_version_h
-#define _SDL_version_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \brief Information the version of SDL in use.
- *
- *  Represents the library's version as three levels: major revision
- *  (increments with massive changes, additions, and enhancements),
- *  minor revision (increments with backwards-compatible changes to the
- *  major revision), and patchlevel (increments with fixes to the minor
- *  revision).
- *
- *  \sa SDL_VERSION
- *  \sa SDL_GetVersion
- */
-typedef struct SDL_version
-{
-    Uint8 major;        /**< major version */
-    Uint8 minor;        /**< minor version */
-    Uint8 patch;        /**< update version */
-} SDL_version;
-
-/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
-*/
-#define SDL_MAJOR_VERSION   2
-#define SDL_MINOR_VERSION   0
-#define SDL_PATCHLEVEL      3
-
-/**
- *  \brief Macro to determine SDL version program was compiled against.
- *
- *  This macro fills in a SDL_version structure with the version of the
- *  library you compiled against. This is determined by what header the
- *  compiler uses. Note that if you dynamically linked the library, you might
- *  have a slightly newer or older version at runtime. That version can be
- *  determined with SDL_GetVersion(), which, unlike SDL_VERSION(),
- *  is not a macro.
- *
- *  \param x A pointer to a SDL_version struct to initialize.
- *
- *  \sa SDL_version
- *  \sa SDL_GetVersion
- */
-#define SDL_VERSION(x)                          \
-{                                   \
-    (x)->major = SDL_MAJOR_VERSION;                 \
-    (x)->minor = SDL_MINOR_VERSION;                 \
-    (x)->patch = SDL_PATCHLEVEL;                    \
-}
-
-/**
- *  This macro turns the version numbers into a numeric value:
- *  \verbatim
-    (1,2,3) -> (1203)
-    \endverbatim
- *
- *  This assumes that there will never be more than 100 patchlevels.
- */
-#define SDL_VERSIONNUM(X, Y, Z)                     \
-    ((X)*1000 + (Y)*100 + (Z))
-
-/**
- *  This is the version number macro for the current SDL version.
- */
-#define SDL_COMPILEDVERSION \
-    SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL)
-
-/**
- *  This macro will evaluate to true if compiled with SDL at least X.Y.Z.
- */
-#define SDL_VERSION_ATLEAST(X, Y, Z) \
-    (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z))
-
-/**
- *  \brief Get the version of SDL that is linked against your program.
- *
- *  If you are linking to SDL dynamically, then it is possible that the
- *  current version will be different than the version you compiled against.
- *  This function returns the current version, while SDL_VERSION() is a
- *  macro that tells you what version you compiled with.
- *
- *  \code
- *  SDL_version compiled;
- *  SDL_version linked;
- *
- *  SDL_VERSION(&compiled);
- *  SDL_GetVersion(&linked);
- *  printf("We compiled against SDL version %d.%d.%d ...\n",
- *         compiled.major, compiled.minor, compiled.patch);
- *  printf("But we linked against SDL version %d.%d.%d.\n",
- *         linked.major, linked.minor, linked.patch);
- *  \endcode
- *
- *  This function may be called safely at any time, even before SDL_Init().
- *
- *  \sa SDL_VERSION
- */
-extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver);
-
-/**
- *  \brief Get the code revision of SDL that is linked against your program.
- *
- *  Returns an arbitrary string (a hash value) uniquely identifying the
- *  exact revision of the SDL library in use, and is only useful in comparing
- *  against other revisions. It is NOT an incrementing number.
- */
-extern DECLSPEC const char *SDLCALL SDL_GetRevision(void);
-
-/**
- *  \brief Get the revision number of SDL that is linked against your program.
- *
- *  Returns a number uniquely identifying the exact revision of the SDL
- *  library in use. It is an incrementing number based on commits to
- *  hg.libsdl.org.
- */
-extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_version_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/SDL_video.h b/linux-x86/include/SDL2/SDL_video.h
deleted file mode 100644
index 49ea37a..0000000
--- a/linux-x86/include/SDL2/SDL_video.h
+++ /dev/null
@@ -1,979 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_video.h
- *
- *  Header file for SDL video functions.
- */
-
-#ifndef _SDL_video_h
-#define _SDL_video_h
-
-#include "SDL_stdinc.h"
-#include "SDL_pixels.h"
-#include "SDL_rect.h"
-#include "SDL_surface.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  \brief  The structure that defines a display mode
- *
- *  \sa SDL_GetNumDisplayModes()
- *  \sa SDL_GetDisplayMode()
- *  \sa SDL_GetDesktopDisplayMode()
- *  \sa SDL_GetCurrentDisplayMode()
- *  \sa SDL_GetClosestDisplayMode()
- *  \sa SDL_SetWindowDisplayMode()
- *  \sa SDL_GetWindowDisplayMode()
- */
-typedef struct
-{
-    Uint32 format;              /**< pixel format */
-    int w;                      /**< width */
-    int h;                      /**< height */
-    int refresh_rate;           /**< refresh rate (or zero for unspecified) */
-    void *driverdata;           /**< driver-specific data, initialize to 0 */
-} SDL_DisplayMode;
-
-/**
- *  \brief The type used to identify a window
- *
- *  \sa SDL_CreateWindow()
- *  \sa SDL_CreateWindowFrom()
- *  \sa SDL_DestroyWindow()
- *  \sa SDL_GetWindowData()
- *  \sa SDL_GetWindowFlags()
- *  \sa SDL_GetWindowGrab()
- *  \sa SDL_GetWindowPosition()
- *  \sa SDL_GetWindowSize()
- *  \sa SDL_GetWindowTitle()
- *  \sa SDL_HideWindow()
- *  \sa SDL_MaximizeWindow()
- *  \sa SDL_MinimizeWindow()
- *  \sa SDL_RaiseWindow()
- *  \sa SDL_RestoreWindow()
- *  \sa SDL_SetWindowData()
- *  \sa SDL_SetWindowFullscreen()
- *  \sa SDL_SetWindowGrab()
- *  \sa SDL_SetWindowIcon()
- *  \sa SDL_SetWindowPosition()
- *  \sa SDL_SetWindowSize()
- *  \sa SDL_SetWindowBordered()
- *  \sa SDL_SetWindowTitle()
- *  \sa SDL_ShowWindow()
- */
-typedef struct SDL_Window SDL_Window;
-
-/**
- *  \brief The flags on a window
- *
- *  \sa SDL_GetWindowFlags()
- */
-typedef enum
-{
-    SDL_WINDOW_FULLSCREEN = 0x00000001,         /**< fullscreen window */
-    SDL_WINDOW_OPENGL = 0x00000002,             /**< window usable with OpenGL context */
-    SDL_WINDOW_SHOWN = 0x00000004,              /**< window is visible */
-    SDL_WINDOW_HIDDEN = 0x00000008,             /**< window is not visible */
-    SDL_WINDOW_BORDERLESS = 0x00000010,         /**< no window decoration */
-    SDL_WINDOW_RESIZABLE = 0x00000020,          /**< window can be resized */
-    SDL_WINDOW_MINIMIZED = 0x00000040,          /**< window is minimized */
-    SDL_WINDOW_MAXIMIZED = 0x00000080,          /**< window is maximized */
-    SDL_WINDOW_INPUT_GRABBED = 0x00000100,      /**< window has grabbed input focus */
-    SDL_WINDOW_INPUT_FOCUS = 0x00000200,        /**< window has input focus */
-    SDL_WINDOW_MOUSE_FOCUS = 0x00000400,        /**< window has mouse focus */
-    SDL_WINDOW_FULLSCREEN_DESKTOP = ( SDL_WINDOW_FULLSCREEN | 0x00001000 ),
-    SDL_WINDOW_FOREIGN = 0x00000800,            /**< window not created by SDL */
-    SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000       /**< window should be created in high-DPI mode if supported */
-} SDL_WindowFlags;
-
-/**
- *  \brief Used to indicate that you don't care what the window position is.
- */
-#define SDL_WINDOWPOS_UNDEFINED_MASK    0x1FFF0000
-#define SDL_WINDOWPOS_UNDEFINED_DISPLAY(X)  (SDL_WINDOWPOS_UNDEFINED_MASK|(X))
-#define SDL_WINDOWPOS_UNDEFINED         SDL_WINDOWPOS_UNDEFINED_DISPLAY(0)
-#define SDL_WINDOWPOS_ISUNDEFINED(X)    \
-            (((X)&0xFFFF0000) == SDL_WINDOWPOS_UNDEFINED_MASK)
-
-/**
- *  \brief Used to indicate that the window position should be centered.
- */
-#define SDL_WINDOWPOS_CENTERED_MASK    0x2FFF0000
-#define SDL_WINDOWPOS_CENTERED_DISPLAY(X)  (SDL_WINDOWPOS_CENTERED_MASK|(X))
-#define SDL_WINDOWPOS_CENTERED         SDL_WINDOWPOS_CENTERED_DISPLAY(0)
-#define SDL_WINDOWPOS_ISCENTERED(X)    \
-            (((X)&0xFFFF0000) == SDL_WINDOWPOS_CENTERED_MASK)
-
-/**
- *  \brief Event subtype for window events
- */
-typedef enum
-{
-    SDL_WINDOWEVENT_NONE,           /**< Never used */
-    SDL_WINDOWEVENT_SHOWN,          /**< Window has been shown */
-    SDL_WINDOWEVENT_HIDDEN,         /**< Window has been hidden */
-    SDL_WINDOWEVENT_EXPOSED,        /**< Window has been exposed and should be
-                                         redrawn */
-    SDL_WINDOWEVENT_MOVED,          /**< Window has been moved to data1, data2
-                                     */
-    SDL_WINDOWEVENT_RESIZED,        /**< Window has been resized to data1xdata2 */
-    SDL_WINDOWEVENT_SIZE_CHANGED,   /**< The window size has changed, either as a result of an API call or through the system or user changing the window size. */
-    SDL_WINDOWEVENT_MINIMIZED,      /**< Window has been minimized */
-    SDL_WINDOWEVENT_MAXIMIZED,      /**< Window has been maximized */
-    SDL_WINDOWEVENT_RESTORED,       /**< Window has been restored to normal size
-                                         and position */
-    SDL_WINDOWEVENT_ENTER,          /**< Window has gained mouse focus */
-    SDL_WINDOWEVENT_LEAVE,          /**< Window has lost mouse focus */
-    SDL_WINDOWEVENT_FOCUS_GAINED,   /**< Window has gained keyboard focus */
-    SDL_WINDOWEVENT_FOCUS_LOST,     /**< Window has lost keyboard focus */
-    SDL_WINDOWEVENT_CLOSE           /**< The window manager requests that the
-                                         window be closed */
-} SDL_WindowEventID;
-
-/**
- *  \brief An opaque handle to an OpenGL context.
- */
-typedef void *SDL_GLContext;
-
-/**
- *  \brief OpenGL configuration attributes
- */
-typedef enum
-{
-    SDL_GL_RED_SIZE,
-    SDL_GL_GREEN_SIZE,
-    SDL_GL_BLUE_SIZE,
-    SDL_GL_ALPHA_SIZE,
-    SDL_GL_BUFFER_SIZE,
-    SDL_GL_DOUBLEBUFFER,
-    SDL_GL_DEPTH_SIZE,
-    SDL_GL_STENCIL_SIZE,
-    SDL_GL_ACCUM_RED_SIZE,
-    SDL_GL_ACCUM_GREEN_SIZE,
-    SDL_GL_ACCUM_BLUE_SIZE,
-    SDL_GL_ACCUM_ALPHA_SIZE,
-    SDL_GL_STEREO,
-    SDL_GL_MULTISAMPLEBUFFERS,
-    SDL_GL_MULTISAMPLESAMPLES,
-    SDL_GL_ACCELERATED_VISUAL,
-    SDL_GL_RETAINED_BACKING,
-    SDL_GL_CONTEXT_MAJOR_VERSION,
-    SDL_GL_CONTEXT_MINOR_VERSION,
-    SDL_GL_CONTEXT_EGL,
-    SDL_GL_CONTEXT_FLAGS,
-    SDL_GL_CONTEXT_PROFILE_MASK,
-    SDL_GL_SHARE_WITH_CURRENT_CONTEXT,
-    SDL_GL_FRAMEBUFFER_SRGB_CAPABLE
-} SDL_GLattr;
-
-typedef enum
-{
-    SDL_GL_CONTEXT_PROFILE_CORE           = 0x0001,
-    SDL_GL_CONTEXT_PROFILE_COMPATIBILITY  = 0x0002,
-    SDL_GL_CONTEXT_PROFILE_ES             = 0x0004 /* GLX_CONTEXT_ES2_PROFILE_BIT_EXT */
-} SDL_GLprofile;
-
-typedef enum
-{
-    SDL_GL_CONTEXT_DEBUG_FLAG              = 0x0001,
-    SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002,
-    SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG      = 0x0004,
-    SDL_GL_CONTEXT_RESET_ISOLATION_FLAG    = 0x0008
-} SDL_GLcontextFlag;
-
-
-/* Function prototypes */
-
-/**
- *  \brief Get the number of video drivers compiled into SDL
- *
- *  \sa SDL_GetVideoDriver()
- */
-extern DECLSPEC int SDLCALL SDL_GetNumVideoDrivers(void);
-
-/**
- *  \brief Get the name of a built in video driver.
- *
- *  \note The video drivers are presented in the order in which they are
- *        normally checked during initialization.
- *
- *  \sa SDL_GetNumVideoDrivers()
- */
-extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index);
-
-/**
- *  \brief Initialize the video subsystem, optionally specifying a video driver.
- *
- *  \param driver_name Initialize a specific driver by name, or NULL for the
- *                     default video driver.
- *
- *  \return 0 on success, -1 on error
- *
- *  This function initializes the video subsystem; setting up a connection
- *  to the window manager, etc, and determines the available display modes
- *  and pixel formats, but does not initialize a window or graphics mode.
- *
- *  \sa SDL_VideoQuit()
- */
-extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name);
-
-/**
- *  \brief Shuts down the video subsystem.
- *
- *  This function closes all windows, and restores the original video mode.
- *
- *  \sa SDL_VideoInit()
- */
-extern DECLSPEC void SDLCALL SDL_VideoQuit(void);
-
-/**
- *  \brief Returns the name of the currently initialized video driver.
- *
- *  \return The name of the current video driver or NULL if no driver
- *          has been initialized
- *
- *  \sa SDL_GetNumVideoDrivers()
- *  \sa SDL_GetVideoDriver()
- */
-extern DECLSPEC const char *SDLCALL SDL_GetCurrentVideoDriver(void);
-
-/**
- *  \brief Returns the number of available video displays.
- *
- *  \sa SDL_GetDisplayBounds()
- */
-extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void);
-
-/**
- *  \brief Get the name of a display in UTF-8 encoding
- *
- *  \return The name of a display, or NULL for an invalid display index.
- *
- *  \sa SDL_GetNumVideoDisplays()
- */
-extern DECLSPEC const char * SDLCALL SDL_GetDisplayName(int displayIndex);
-
-/**
- *  \brief Get the desktop area represented by a display, with the primary
- *         display located at 0,0
- *
- *  \return 0 on success, or -1 if the index is out of range.
- *
- *  \sa SDL_GetNumVideoDisplays()
- */
-extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect);
-
-/**
- *  \brief Returns the number of available display modes.
- *
- *  \sa SDL_GetDisplayMode()
- */
-extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(int displayIndex);
-
-/**
- *  \brief Fill in information about a specific display mode.
- *
- *  \note The display modes are sorted in this priority:
- *        \li bits per pixel -> more colors to fewer colors
- *        \li width -> largest to smallest
- *        \li height -> largest to smallest
- *        \li refresh rate -> highest to lowest
- *
- *  \sa SDL_GetNumDisplayModes()
- */
-extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int displayIndex, int modeIndex,
-                                               SDL_DisplayMode * mode);
-
-/**
- *  \brief Fill in information about the desktop display mode.
- */
-extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode);
-
-/**
- *  \brief Fill in information about the current display mode.
- */
-extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode);
-
-
-/**
- *  \brief Get the closest match to the requested display mode.
- *
- *  \param displayIndex The index of display from which mode should be queried.
- *  \param mode The desired display mode
- *  \param closest A pointer to a display mode to be filled in with the closest
- *                 match of the available display modes.
- *
- *  \return The passed in value \c closest, or NULL if no matching video mode
- *          was available.
- *
- *  The available display modes are scanned, and \c closest is filled in with the
- *  closest mode matching the requested mode and returned.  The mode format and
- *  refresh_rate default to the desktop mode if they are 0.  The modes are
- *  scanned with size being first priority, format being second priority, and
- *  finally checking the refresh_rate.  If all the available modes are too
- *  small, then NULL is returned.
- *
- *  \sa SDL_GetNumDisplayModes()
- *  \sa SDL_GetDisplayMode()
- */
-extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest);
-
-/**
- *  \brief Get the display index associated with a window.
- *
- *  \return the display index of the display containing the center of the
- *          window, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window);
-
-/**
- *  \brief Set the display mode used when a fullscreen window is visible.
- *
- *  By default the window's dimensions and the desktop format and refresh rate
- *  are used.
- *
- *  \param window The window for which the display mode should be set.
- *  \param mode The mode to use, or NULL for the default mode.
- *
- *  \return 0 on success, or -1 if setting the display mode failed.
- *
- *  \sa SDL_GetWindowDisplayMode()
- *  \sa SDL_SetWindowFullscreen()
- */
-extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_Window * window,
-                                                     const SDL_DisplayMode
-                                                         * mode);
-
-/**
- *  \brief Fill in information about the display mode used when a fullscreen
- *         window is visible.
- *
- *  \sa SDL_SetWindowDisplayMode()
- *  \sa SDL_SetWindowFullscreen()
- */
-extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_Window * window,
-                                                     SDL_DisplayMode * mode);
-
-/**
- *  \brief Get the pixel format associated with the window.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window);
-
-/**
- *  \brief Create a window with the specified position, dimensions, and flags.
- *
- *  \param title The title of the window, in UTF-8 encoding.
- *  \param x     The x position of the window, ::SDL_WINDOWPOS_CENTERED, or
- *               ::SDL_WINDOWPOS_UNDEFINED.
- *  \param y     The y position of the window, ::SDL_WINDOWPOS_CENTERED, or
- *               ::SDL_WINDOWPOS_UNDEFINED.
- *  \param w     The width of the window.
- *  \param h     The height of the window.
- *  \param flags The flags for the window, a mask of any of the following:
- *               ::SDL_WINDOW_FULLSCREEN,    ::SDL_WINDOW_OPENGL,
- *               ::SDL_WINDOW_HIDDEN,        ::SDL_WINDOW_BORDERLESS,
- *               ::SDL_WINDOW_RESIZABLE,     ::SDL_WINDOW_MAXIMIZED,
- *               ::SDL_WINDOW_MINIMIZED,     ::SDL_WINDOW_INPUT_GRABBED,
- *               ::SDL_WINDOW_ALLOW_HIGHDPI.
- *
- *  \return The id of the window created, or zero if window creation failed.
- *
- *  \sa SDL_DestroyWindow()
- */
-extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title,
-                                                      int x, int y, int w,
-                                                      int h, Uint32 flags);
-
-/**
- *  \brief Create an SDL window from an existing native window.
- *
- *  \param data A pointer to driver-dependent window creation data
- *
- *  \return The id of the window created, or zero if window creation failed.
- *
- *  \sa SDL_DestroyWindow()
- */
-extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowFrom(const void *data);
-
-/**
- *  \brief Get the numeric ID of a window, for logging purposes.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetWindowID(SDL_Window * window);
-
-/**
- *  \brief Get a window from a stored ID, or NULL if it doesn't exist.
- */
-extern DECLSPEC SDL_Window * SDLCALL SDL_GetWindowFromID(Uint32 id);
-
-/**
- *  \brief Get the window flags.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window * window);
-
-/**
- *  \brief Set the title of a window, in UTF-8 format.
- *
- *  \sa SDL_GetWindowTitle()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_Window * window,
-                                                const char *title);
-
-/**
- *  \brief Get the title of a window, in UTF-8 format.
- *
- *  \sa SDL_SetWindowTitle()
- */
-extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_Window * window);
-
-/**
- *  \brief Set the icon for a window.
- *
- *  \param window The window for which the icon should be set.
- *  \param icon The icon for the window.
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_Window * window,
-                                               SDL_Surface * icon);
-
-/**
- *  \brief Associate an arbitrary named pointer with a window.
- *
- *  \param window   The window to associate with the pointer.
- *  \param name     The name of the pointer.
- *  \param userdata The associated pointer.
- *
- *  \return The previous value associated with 'name'
- *
- *  \note The name is case-sensitive.
- *
- *  \sa SDL_GetWindowData()
- */
-extern DECLSPEC void* SDLCALL SDL_SetWindowData(SDL_Window * window,
-                                                const char *name,
-                                                void *userdata);
-
-/**
- *  \brief Retrieve the data pointer associated with a window.
- *
- *  \param window   The window to query.
- *  \param name     The name of the pointer.
- *
- *  \return The value associated with 'name'
- *
- *  \sa SDL_SetWindowData()
- */
-extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window,
-                                                const char *name);
-
-/**
- *  \brief Set the position of a window.
- *
- *  \param window   The window to reposition.
- *  \param x        The x coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or
-                    ::SDL_WINDOWPOS_UNDEFINED.
- *  \param y        The y coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or
-                    ::SDL_WINDOWPOS_UNDEFINED.
- *
- *  \note The window coordinate origin is the upper left of the display.
- *
- *  \sa SDL_GetWindowPosition()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window,
-                                                   int x, int y);
-
-/**
- *  \brief Get the position of a window.
- *
- *  \param window   The window to query.
- *  \param x        Pointer to variable for storing the x position, may be NULL
- *  \param y        Pointer to variable for storing the y position, may be NULL
- *
- *  \sa SDL_SetWindowPosition()
- */
-extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window,
-                                                   int *x, int *y);
-
-/**
- *  \brief Set the size of a window's client area.
- *
- *  \param window   The window to resize.
- *  \param w        The width of the window, must be >0
- *  \param h        The height of the window, must be >0
- *
- *  \note You can't change the size of a fullscreen window, it automatically
- *        matches the size of the display mode.
- *
- *  \sa SDL_GetWindowSize()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w,
-                                               int h);
-
-/**
- *  \brief Get the size of a window's client area.
- *
- *  \param window   The window to query.
- *  \param w        Pointer to variable for storing the width, may be NULL
- *  \param h        Pointer to variable for storing the height, may be NULL
- *
- *  \sa SDL_SetWindowSize()
- */
-extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w,
-                                               int *h);
-
-/**
- *  \brief Set the minimum size of a window's client area.
- *
- *  \param window    The window to set a new minimum size.
- *  \param min_w     The minimum width of the window, must be >0
- *  \param min_h     The minimum height of the window, must be >0
- *
- *  \note You can't change the minimum size of a fullscreen window, it
- *        automatically matches the size of the display mode.
- *
- *  \sa SDL_GetWindowMinimumSize()
- *  \sa SDL_SetWindowMaximumSize()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowMinimumSize(SDL_Window * window,
-                                                      int min_w, int min_h);
-
-/**
- *  \brief Get the minimum size of a window's client area.
- *
- *  \param window   The window to query.
- *  \param w        Pointer to variable for storing the minimum width, may be NULL
- *  \param h        Pointer to variable for storing the minimum height, may be NULL
- *
- *  \sa SDL_GetWindowMaximumSize()
- *  \sa SDL_SetWindowMinimumSize()
- */
-extern DECLSPEC void SDLCALL SDL_GetWindowMinimumSize(SDL_Window * window,
-                                                      int *w, int *h);
-
-/**
- *  \brief Set the maximum size of a window's client area.
- *
- *  \param window    The window to set a new maximum size.
- *  \param max_w     The maximum width of the window, must be >0
- *  \param max_h     The maximum height of the window, must be >0
- *
- *  \note You can't change the maximum size of a fullscreen window, it
- *        automatically matches the size of the display mode.
- *
- *  \sa SDL_GetWindowMaximumSize()
- *  \sa SDL_SetWindowMinimumSize()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowMaximumSize(SDL_Window * window,
-                                                      int max_w, int max_h);
-
-/**
- *  \brief Get the maximum size of a window's client area.
- *
- *  \param window   The window to query.
- *  \param w        Pointer to variable for storing the maximum width, may be NULL
- *  \param h        Pointer to variable for storing the maximum height, may be NULL
- *
- *  \sa SDL_GetWindowMinimumSize()
- *  \sa SDL_SetWindowMaximumSize()
- */
-extern DECLSPEC void SDLCALL SDL_GetWindowMaximumSize(SDL_Window * window,
-                                                      int *w, int *h);
-
-/**
- *  \brief Set the border state of a window.
- *
- *  This will add or remove the window's SDL_WINDOW_BORDERLESS flag and
- *  add or remove the border from the actual window. This is a no-op if the
- *  window's border already matches the requested state.
- *
- *  \param window The window of which to change the border state.
- *  \param bordered SDL_FALSE to remove border, SDL_TRUE to add border.
- *
- *  \note You can't change the border state of a fullscreen window.
- *
- *  \sa SDL_GetWindowFlags()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowBordered(SDL_Window * window,
-                                                   SDL_bool bordered);
-
-/**
- *  \brief Show a window.
- *
- *  \sa SDL_HideWindow()
- */
-extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_Window * window);
-
-/**
- *  \brief Hide a window.
- *
- *  \sa SDL_ShowWindow()
- */
-extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_Window * window);
-
-/**
- *  \brief Raise a window above other windows and set the input focus.
- */
-extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_Window * window);
-
-/**
- *  \brief Make a window as large as possible.
- *
- *  \sa SDL_RestoreWindow()
- */
-extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_Window * window);
-
-/**
- *  \brief Minimize a window to an iconic representation.
- *
- *  \sa SDL_RestoreWindow()
- */
-extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_Window * window);
-
-/**
- *  \brief Restore the size and position of a minimized or maximized window.
- *
- *  \sa SDL_MaximizeWindow()
- *  \sa SDL_MinimizeWindow()
- */
-extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window);
-
-/**
- *  \brief Set a window's fullscreen state.
- *
- *  \return 0 on success, or -1 if setting the display mode failed.
- *
- *  \sa SDL_SetWindowDisplayMode()
- *  \sa SDL_GetWindowDisplayMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window,
-                                                    Uint32 flags);
-
-/**
- *  \brief Get the SDL surface associated with the window.
- *
- *  \return The window's framebuffer surface, or NULL on error.
- *
- *  A new surface will be created with the optimal format for the window,
- *  if necessary. This surface will be freed when the window is destroyed.
- *
- *  \note You may not combine this with 3D or the rendering API on this window.
- *
- *  \sa SDL_UpdateWindowSurface()
- *  \sa SDL_UpdateWindowSurfaceRects()
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_GetWindowSurface(SDL_Window * window);
-
-/**
- *  \brief Copy the window surface to the screen.
- *
- *  \return 0 on success, or -1 on error.
- *
- *  \sa SDL_GetWindowSurface()
- *  \sa SDL_UpdateWindowSurfaceRects()
- */
-extern DECLSPEC int SDLCALL SDL_UpdateWindowSurface(SDL_Window * window);
-
-/**
- *  \brief Copy a number of rectangles on the window surface to the screen.
- *
- *  \return 0 on success, or -1 on error.
- *
- *  \sa SDL_GetWindowSurface()
- *  \sa SDL_UpdateWindowSurfaceRect()
- */
-extern DECLSPEC int SDLCALL SDL_UpdateWindowSurfaceRects(SDL_Window * window,
-                                                         const SDL_Rect * rects,
-                                                         int numrects);
-
-/**
- *  \brief Set a window's input grab mode.
- *
- *  \param window The window for which the input grab mode should be set.
- *  \param grabbed This is SDL_TRUE to grab input, and SDL_FALSE to release input.
- *
- *  \sa SDL_GetWindowGrab()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window,
-                                               SDL_bool grabbed);
-
-/**
- *  \brief Get a window's input grab mode.
- *
- *  \return This returns SDL_TRUE if input is grabbed, and SDL_FALSE otherwise.
- *
- *  \sa SDL_SetWindowGrab()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowGrab(SDL_Window * window);
-
-/**
- *  \brief Set the brightness (gamma correction) for a window.
- *
- *  \return 0 on success, or -1 if setting the brightness isn't supported.
- *
- *  \sa SDL_GetWindowBrightness()
- *  \sa SDL_SetWindowGammaRamp()
- */
-extern DECLSPEC int SDLCALL SDL_SetWindowBrightness(SDL_Window * window, float brightness);
-
-/**
- *  \brief Get the brightness (gamma correction) for a window.
- *
- *  \return The last brightness value passed to SDL_SetWindowBrightness()
- *
- *  \sa SDL_SetWindowBrightness()
- */
-extern DECLSPEC float SDLCALL SDL_GetWindowBrightness(SDL_Window * window);
-
-/**
- *  \brief Set the gamma ramp for a window.
- *
- *  \param window The window for which the gamma ramp should be set.
- *  \param red The translation table for the red channel, or NULL.
- *  \param green The translation table for the green channel, or NULL.
- *  \param blue The translation table for the blue channel, or NULL.
- *
- *  \return 0 on success, or -1 if gamma ramps are unsupported.
- *
- *  Set the gamma translation table for the red, green, and blue channels
- *  of the video hardware.  Each table is an array of 256 16-bit quantities,
- *  representing a mapping between the input and output for that channel.
- *  The input is the index into the array, and the output is the 16-bit
- *  gamma value at that index, scaled to the output color precision.
- *
- *  \sa SDL_GetWindowGammaRamp()
- */
-extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window,
-                                                   const Uint16 * red,
-                                                   const Uint16 * green,
-                                                   const Uint16 * blue);
-
-/**
- *  \brief Get the gamma ramp for a window.
- *
- *  \param window The window from which the gamma ramp should be queried.
- *  \param red   A pointer to a 256 element array of 16-bit quantities to hold
- *               the translation table for the red channel, or NULL.
- *  \param green A pointer to a 256 element array of 16-bit quantities to hold
- *               the translation table for the green channel, or NULL.
- *  \param blue  A pointer to a 256 element array of 16-bit quantities to hold
- *               the translation table for the blue channel, or NULL.
- *
- *  \return 0 on success, or -1 if gamma ramps are unsupported.
- *
- *  \sa SDL_SetWindowGammaRamp()
- */
-extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window,
-                                                   Uint16 * red,
-                                                   Uint16 * green,
-                                                   Uint16 * blue);
-
-/**
- *  \brief Destroy a window.
- */
-extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window);
-
-
-/**
- *  \brief Returns whether the screensaver is currently enabled (default on).
- *
- *  \sa SDL_EnableScreenSaver()
- *  \sa SDL_DisableScreenSaver()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void);
-
-/**
- *  \brief Allow the screen to be blanked by a screensaver
- *
- *  \sa SDL_IsScreenSaverEnabled()
- *  \sa SDL_DisableScreenSaver()
- */
-extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void);
-
-/**
- *  \brief Prevent the screen from being blanked by a screensaver
- *
- *  \sa SDL_IsScreenSaverEnabled()
- *  \sa SDL_EnableScreenSaver()
- */
-extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void);
-
-
-/**
- *  \name OpenGL support functions
- */
-/* @{ */
-
-/**
- *  \brief Dynamically load an OpenGL library.
- *
- *  \param path The platform dependent OpenGL library name, or NULL to open the
- *              default OpenGL library.
- *
- *  \return 0 on success, or -1 if the library couldn't be loaded.
- *
- *  This should be done after initializing the video driver, but before
- *  creating any OpenGL windows.  If no OpenGL library is loaded, the default
- *  library will be loaded upon creation of the first OpenGL window.
- *
- *  \note If you do this, you need to retrieve all of the GL functions used in
- *        your program from the dynamic library using SDL_GL_GetProcAddress().
- *
- *  \sa SDL_GL_GetProcAddress()
- *  \sa SDL_GL_UnloadLibrary()
- */
-extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path);
-
-/**
- *  \brief Get the address of an OpenGL function.
- */
-extern DECLSPEC void *SDLCALL SDL_GL_GetProcAddress(const char *proc);
-
-/**
- *  \brief Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary().
- *
- *  \sa SDL_GL_LoadLibrary()
- */
-extern DECLSPEC void SDLCALL SDL_GL_UnloadLibrary(void);
-
-/**
- *  \brief Return true if an OpenGL extension is supported for the current
- *         context.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_GL_ExtensionSupported(const char
-                                                           *extension);
-
-/**
- *  \brief Reset all previously set OpenGL context attributes to their default values
- */
-extern DECLSPEC void SDLCALL SDL_GL_ResetAttributes(void);
-
-/**
- *  \brief Set an OpenGL window attribute before window creation.
- */
-extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value);
-
-/**
- *  \brief Get the actual value for an attribute from the current context.
- */
-extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int *value);
-
-/**
- *  \brief Create an OpenGL context for use with an OpenGL window, and make it
- *         current.
- *
- *  \sa SDL_GL_DeleteContext()
- */
-extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_Window *
-                                                           window);
-
-/**
- *  \brief Set up an OpenGL context for rendering into an OpenGL window.
- *
- *  \note The context must have been created with a compatible window.
- */
-extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_Window * window,
-                                               SDL_GLContext context);
-
-/**
- *  \brief Get the currently active OpenGL window.
- */
-extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void);
-
-/**
- *  \brief Get the currently active OpenGL context.
- */
-extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void);
-
-/**
- *  \brief Get the size of a window's underlying drawable (for use with glViewport).
- *
- *  \param window   Window from which the drawable size should be queried
- *  \param w        Pointer to variable for storing the width, may be NULL
- *  \param h        Pointer to variable for storing the height, may be NULL
- *
- * This may differ from SDL_GetWindowSize if we're rendering to a high-DPI
- * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a
- * platform with high-DPI support (Apple calls this "Retina"), and not disabled
- * by the SDL_HINT_VIDEO_HIGHDPI_DISABLED hint.
- *
- *  \sa SDL_GetWindowSize()
- *  \sa SDL_CreateWindow()
- */
-extern DECLSPEC void SDLCALL SDL_GL_GetDrawableSize(SDL_Window * window, int *w,
-                                                    int *h);
-
-/**
- *  \brief Set the swap interval for the current OpenGL context.
- *
- *  \param interval 0 for immediate updates, 1 for updates synchronized with the
- *                  vertical retrace. If the system supports it, you may
- *                  specify -1 to allow late swaps to happen immediately
- *                  instead of waiting for the next retrace.
- *
- *  \return 0 on success, or -1 if setting the swap interval is not supported.
- *
- *  \sa SDL_GL_GetSwapInterval()
- */
-extern DECLSPEC int SDLCALL SDL_GL_SetSwapInterval(int interval);
-
-/**
- *  \brief Get the swap interval for the current OpenGL context.
- *
- *  \return 0 if there is no vertical retrace synchronization, 1 if the buffer
- *          swap is synchronized with the vertical retrace, and -1 if late
- *          swaps happen immediately instead of waiting for the next retrace.
- *          If the system can't determine the swap interval, or there isn't a
- *          valid current context, this will return 0 as a safe default.
- *
- *  \sa SDL_GL_SetSwapInterval()
- */
-extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void);
-
-/**
- * \brief Swap the OpenGL buffers for a window, if double-buffering is
- *        supported.
- */
-extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window);
-
-/**
- *  \brief Delete an OpenGL context.
- *
- *  \sa SDL_GL_CreateContext()
- */
-extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
-
-/* @} *//* OpenGL support functions */
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_video_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/linux-x86/include/SDL2/begin_code.h b/linux-x86/include/SDL2/begin_code.h
deleted file mode 100644
index f37ee36..0000000
--- a/linux-x86/include/SDL2/begin_code.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file begin_code.h
- *
- *  This file sets things up for C dynamic library function definitions,
- *  static inlined functions, and structures aligned at 4-byte alignment.
- *  If you don't like ugly C preprocessor code, don't look at this file. :)
- */
-
-/* This shouldn't be nested -- included it around code only. */
-#ifdef _begin_code_h
-#error Nested inclusion of begin_code.h
-#endif
-#define _begin_code_h
-
-#ifndef SDL_DEPRECATED
-#  if (__GNUC__ >= 4)  /* technically, this arrived in gcc 3.1, but oh well. */
-#    define SDL_DEPRECATED __attribute__((deprecated))
-#  else
-#    define SDL_DEPRECATED
-#  endif
-#endif
-
-/* Some compilers use a special export keyword */
-#ifndef DECLSPEC
-# if defined(__WIN32__) || defined(__WINRT__)
-#  ifdef __BORLANDC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC
-#   else
-#    define DECLSPEC    __declspec(dllimport)
-#   endif
-#  else
-#   define DECLSPEC __declspec(dllexport)
-#  endif
-# else
-#  if defined(__GNUC__) && __GNUC__ >= 4
-#   define DECLSPEC __attribute__ ((visibility("default")))
-#  elif defined(__GNUC__) && __GNUC__ >= 2
-#   define DECLSPEC __declspec(dllexport)
-#  else
-#   define DECLSPEC
-#  endif
-# endif
-#endif
-
-/* By default SDL uses the C calling convention */
-#ifndef SDLCALL
-#if (defined(__WIN32__) || defined(__WINRT__)) && !defined(__GNUC__)
-#define SDLCALL __cdecl
-#else
-#define SDLCALL
-#endif
-#endif /* SDLCALL */
-
-/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */
-#ifdef __SYMBIAN32__
-#undef DECLSPEC
-#define DECLSPEC
-#endif /* __SYMBIAN32__ */
-
-/* Force structure packing at 4 byte alignment.
-   This is necessary if the header is included in code which has structure
-   packing set to an alternate value, say for loading structures from disk.
-   The packing is reset to the previous value in close_code.h
- */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
-#ifdef _MSC_VER
-#pragma warning(disable: 4103)
-#endif
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#ifdef _M_X64
-/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */
-#pragma pack(push,8)
-#else
-#pragma pack(push,4)
-#endif
-#endif /* Compiler needs structure packing set */
-
-#ifndef SDL_INLINE
-#if defined(__GNUC__)
-#define SDL_INLINE __inline__
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || \
-      defined(__DMC__) || defined(__SC__) || \
-      defined(__WATCOMC__) || defined(__LCC__) || \
-      defined(__DECC)
-#define SDL_INLINE __inline
-#ifndef __inline__
-#define __inline__ __inline
-#endif
-#else
-#define SDL_INLINE inline
-#ifndef __inline__
-#define __inline__ inline
-#endif
-#endif
-#endif /* SDL_INLINE not defined */
-
-#ifndef SDL_FORCE_INLINE
-#if defined(_MSC_VER)
-#define SDL_FORCE_INLINE __forceinline
-#elif ( (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) )
-#define SDL_FORCE_INLINE __attribute__((always_inline)) static __inline__
-#else
-#define SDL_FORCE_INLINE static SDL_INLINE
-#endif
-#endif /* SDL_FORCE_INLINE not defined */
-
-/* Apparently this is needed by several Windows compilers */
-#if !defined(__MACH__)
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif /* NULL */
-#endif /* ! Mac OS X - breaks precompiled headers */
diff --git a/linux-x86/include/SDL2/close_code.h b/linux-x86/include/SDL2/close_code.h
deleted file mode 100644
index 9826f14..0000000
--- a/linux-x86/include/SDL2/close_code.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file close_code.h
- *
- *  This file reverses the effects of begin_code.h and should be included
- *  after you finish any function and structure declarations in your headers
- */
-
-#undef _begin_code_h
-
-/* Reset structure packing at previous byte alignment */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__)  || defined(__BORLANDC__)
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#pragma pack(pop)
-#endif /* Compiler needs structure packing set */
diff --git a/linux-x86/include/fdt.h b/linux-x86/include/fdt.h
deleted file mode 100644
index 526aedb..0000000
--- a/linux-x86/include/fdt.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#ifndef _FDT_H
-#define _FDT_H
-/*
- * libfdt - Flat Device Tree manipulation
- * Copyright (C) 2006 David Gibson, IBM Corporation.
- * Copyright 2012 Kim Phillips, Freescale Semiconductor.
- *
- * libfdt is dual licensed: you can use it either under the terms of
- * the GPL, or the BSD license, at your option.
- *
- *  a) This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
- *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- *     MA 02110-1301 USA
- *
- * Alternatively,
- *
- *  b) Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *     2. Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __ASSEMBLY__
-
-struct fdt_header {
-	fdt32_t magic;			 /* magic word FDT_MAGIC */
-	fdt32_t totalsize;		 /* total size of DT block */
-	fdt32_t off_dt_struct;		 /* offset to structure */
-	fdt32_t off_dt_strings;		 /* offset to strings */
-	fdt32_t off_mem_rsvmap;		 /* offset to memory reserve map */
-	fdt32_t version;		 /* format version */
-	fdt32_t last_comp_version;	 /* last compatible version */
-
-	/* version 2 fields below */
-	fdt32_t boot_cpuid_phys;	 /* Which physical CPU id we're
-					    booting on */
-	/* version 3 fields below */
-	fdt32_t size_dt_strings;	 /* size of the strings block */
-
-	/* version 17 fields below */
-	fdt32_t size_dt_struct;		 /* size of the structure block */
-};
-
-struct fdt_reserve_entry {
-	fdt64_t address;
-	fdt64_t size;
-};
-
-struct fdt_node_header {
-	fdt32_t tag;
-	char name[0];
-};
-
-struct fdt_property {
-	fdt32_t tag;
-	fdt32_t len;
-	fdt32_t nameoff;
-	char data[0];
-};
-
-#endif /* !__ASSEMBLY */
-
-#define FDT_MAGIC	0xd00dfeed	/* 4: version, 4: total size */
-#define FDT_TAGSIZE	sizeof(fdt32_t)
-
-#define FDT_BEGIN_NODE	0x1		/* Start node: full name */
-#define FDT_END_NODE	0x2		/* End node */
-#define FDT_PROP	0x3		/* Property: name off,
-					   size, content */
-#define FDT_NOP		0x4		/* nop */
-#define FDT_END		0x9
-
-#define FDT_V1_SIZE	(7*sizeof(fdt32_t))
-#define FDT_V2_SIZE	(FDT_V1_SIZE + sizeof(fdt32_t))
-#define FDT_V3_SIZE	(FDT_V2_SIZE + sizeof(fdt32_t))
-#define FDT_V16_SIZE	FDT_V3_SIZE
-#define FDT_V17_SIZE	(FDT_V16_SIZE + sizeof(fdt32_t))
-
-#endif /* _FDT_H */
diff --git a/linux-x86/include/gio-unix-2.0/gio/gdesktopappinfo.h b/linux-x86/include/gio-unix-2.0/gio/gdesktopappinfo.h
deleted file mode 100644
index 5f7f68a..0000000
--- a/linux-x86/include/gio-unix-2.0/gio/gdesktopappinfo.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_DESKTOP_APP_INFO_H__
-#define __G_DESKTOP_APP_INFO_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DESKTOP_APP_INFO         (g_desktop_app_info_get_type ())
-#define G_DESKTOP_APP_INFO(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DESKTOP_APP_INFO, GDesktopAppInfo))
-#define G_DESKTOP_APP_INFO_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DESKTOP_APP_INFO, GDesktopAppInfoClass))
-#define G_IS_DESKTOP_APP_INFO(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DESKTOP_APP_INFO))
-#define G_IS_DESKTOP_APP_INFO_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DESKTOP_APP_INFO))
-#define G_DESKTOP_APP_INFO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DESKTOP_APP_INFO, GDesktopAppInfoClass))
-
-typedef struct _GDesktopAppInfo        GDesktopAppInfo;
-typedef struct _GDesktopAppInfoClass   GDesktopAppInfoClass;
-
-struct _GDesktopAppInfoClass
-{
-  GObjectClass parent_class;
-};
-
-
-GLIB_AVAILABLE_IN_ALL
-GType            g_desktop_app_info_get_type          (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GDesktopAppInfo *g_desktop_app_info_new_from_filename (const char      *filename);
-GLIB_AVAILABLE_IN_ALL
-GDesktopAppInfo *g_desktop_app_info_new_from_keyfile  (GKeyFile        *key_file);
-
-GLIB_AVAILABLE_IN_ALL
-const char *     g_desktop_app_info_get_filename      (GDesktopAppInfo *info);
-
-GLIB_AVAILABLE_IN_2_30
-const char *     g_desktop_app_info_get_generic_name  (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_2_30
-const char *     g_desktop_app_info_get_categories    (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_2_30
-const char * const *g_desktop_app_info_get_keywords   (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_2_30
-gboolean         g_desktop_app_info_get_nodisplay     (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_2_30
-gboolean         g_desktop_app_info_get_show_in       (GDesktopAppInfo *info,
-                                                       const gchar     *desktop_env);
-GLIB_AVAILABLE_IN_2_34
-const char *     g_desktop_app_info_get_startup_wm_class (GDesktopAppInfo *info);
-
-GLIB_AVAILABLE_IN_ALL
-GDesktopAppInfo *g_desktop_app_info_new               (const char      *desktop_id);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_desktop_app_info_get_is_hidden     (GDesktopAppInfo *info);
-
-GLIB_AVAILABLE_IN_ALL
-void             g_desktop_app_info_set_desktop_env   (const char      *desktop_env);
-
-GLIB_AVAILABLE_IN_2_36
-gboolean         g_desktop_app_info_has_key           (GDesktopAppInfo *info,
-                                                       const char      *key);
-GLIB_AVAILABLE_IN_2_36
-char *           g_desktop_app_info_get_string        (GDesktopAppInfo *info,
-                                                       const char      *key);
-GLIB_AVAILABLE_IN_2_36
-gboolean         g_desktop_app_info_get_boolean       (GDesktopAppInfo *info,
-                                                       const char      *key);
-
-GLIB_AVAILABLE_IN_2_38
-const gchar * const *   g_desktop_app_info_list_actions                 (GDesktopAppInfo   *info);
-
-GLIB_AVAILABLE_IN_2_38
-void                    g_desktop_app_info_launch_action                (GDesktopAppInfo   *info,
-                                                                         const gchar       *action_name,
-                                                                         GAppLaunchContext *launch_context);
-
-GLIB_AVAILABLE_IN_2_38
-gchar *                 g_desktop_app_info_get_action_name              (GDesktopAppInfo   *info,
-                                                                         const gchar       *action_name);
-
-#ifndef G_DISABLE_DEPRECATED
-
-#define G_TYPE_DESKTOP_APP_INFO_LOOKUP           (g_desktop_app_info_lookup_get_type ())
-#define G_DESKTOP_APP_INFO_LOOKUP(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookup))
-#define G_IS_DESKTOP_APP_INFO_LOOKUP(obj)	 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP))
-#define G_DESKTOP_APP_INFO_LOOKUP_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookupIface))
-
-/**
- * G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME:
- *
- * Extension point for default handler to URI association. See
- * <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME "gio-desktop-app-info-lookup"
-
-#endif /* G_DISABLE_DEPRECATED */
-
-/**
- * GDesktopAppInfoLookup:
- *
- * Interface that is used by backends to associate default
- * handlers with URI schemes.
- */
-typedef struct _GDesktopAppInfoLookup GDesktopAppInfoLookup;
-typedef struct _GDesktopAppInfoLookupIface GDesktopAppInfoLookupIface;
-
-struct _GDesktopAppInfoLookupIface
-{
-  GTypeInterface g_iface;
-
-  GAppInfo * (* get_default_for_uri_scheme) (GDesktopAppInfoLookup *lookup,
-                                             const char            *uri_scheme);
-};
-
-GLIB_DEPRECATED
-GType     g_desktop_app_info_lookup_get_type                   (void) G_GNUC_CONST;
-
-GLIB_DEPRECATED
-GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
-                                                                const char            *uri_scheme);
-
-/**
- * GDesktopAppLaunchCallback:
- * @appinfo: a #GDesktopAppInfo
- * @pid: Process identifier
- * @user_data: User data
- *
- * During invocation, g_desktop_app_info_launch_uris_as_manager() may
- * create one or more child processes.  This callback is invoked once
- * for each, providing the process ID.
- */
-typedef void (*GDesktopAppLaunchCallback) (GDesktopAppInfo  *appinfo,
-					   GPid              pid,
-					   gpointer          user_data);
-
-GLIB_AVAILABLE_IN_2_28
-gboolean    g_desktop_app_info_launch_uris_as_manager (GDesktopAppInfo            *appinfo,
-						       GList                      *uris,
-						       GAppLaunchContext          *launch_context,
-						       GSpawnFlags                 spawn_flags,
-						       GSpawnChildSetupFunc        user_setup,
-						       gpointer                    user_setup_data,
-						       GDesktopAppLaunchCallback   pid_callback,
-						       gpointer                    pid_callback_data,
-						       GError                    **error);
-
-
-G_END_DECLS
-
-#endif /* __G_DESKTOP_APP_INFO_H__ */
diff --git a/linux-x86/include/gio-unix-2.0/gio/gfiledescriptorbased.h b/linux-x86/include/gio-unix-2.0/gio/gfiledescriptorbased.h
deleted file mode 100644
index cf045b4..0000000
--- a/linux-x86/include/gio-unix-2.0/gio/gfiledescriptorbased.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Christian Kellner
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#ifndef __G_FILE_DESCRIPTOR_BASED_H__
-#define __G_FILE_DESCRIPTOR_BASED_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_DESCRIPTOR_BASED            (g_file_descriptor_based_get_type ())
-#define G_FILE_DESCRIPTOR_BASED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_FILE_DESCRIPTOR_BASED, GFileDescriptorBased))
-#define G_IS_FILE_DESCRIPTOR_BASED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_FILE_DESCRIPTOR_BASED))
-#define G_FILE_DESCRIPTOR_BASED_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_FILE_DESCRIPTOR_BASED, GFileDescriptorBasedIface))
-
-/**
- * GFileDescriptorBased:
- *
- * An interface for file descriptor based io objects.
- **/
-typedef struct _GFileDescriptorBasedIface   GFileDescriptorBasedIface;
-
-/**
- * GFileDescriptorBasedIface:
- * @g_iface: The parent interface.
- *
- **/
-struct _GFileDescriptorBasedIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  int (*get_fd) (GFileDescriptorBased *fd_based);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_file_descriptor_based_get_type     (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-int      g_file_descriptor_based_get_fd       (GFileDescriptorBased *fd_based);
-
-G_END_DECLS
-
-
-#endif /* __G_FILE_DESCRIPTOR_BASED_H__ */
-
diff --git a/linux-x86/include/gio-unix-2.0/gio/gunixconnection.h b/linux-x86/include/gio-unix-2.0/gio/gunixconnection.h
deleted file mode 100644
index bd87374..0000000
--- a/linux-x86/include/gio-unix-2.0/gio/gunixconnection.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_UNIX_CONNECTION_H__
-#define __G_UNIX_CONNECTION_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_UNIX_CONNECTION                              (g_unix_connection_get_type ())
-#define G_UNIX_CONNECTION(inst)                             (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_UNIX_CONNECTION, GUnixConnection))
-#define G_UNIX_CONNECTION_CLASS(class)                      (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_UNIX_CONNECTION, GUnixConnectionClass))
-#define G_IS_UNIX_CONNECTION(inst)                          (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_UNIX_CONNECTION))
-#define G_IS_UNIX_CONNECTION_CLASS(class)                   (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_UNIX_CONNECTION))
-#define G_UNIX_CONNECTION_GET_CLASS(inst)                   (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_UNIX_CONNECTION, GUnixConnectionClass))
-
-typedef struct _GUnixConnection                             GUnixConnection;
-typedef struct _GUnixConnectionPrivate                      GUnixConnectionPrivate;
-typedef struct _GUnixConnectionClass                        GUnixConnectionClass;
-
-struct _GUnixConnectionClass
-{
-  GSocketConnectionClass parent_class;
-};
-
-struct _GUnixConnection
-{
-  GSocketConnection parent_instance;
-  GUnixConnectionPrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_unix_connection_get_type                      (void);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_unix_connection_send_fd                       (GUnixConnection      *connection,
-                                                                         gint                  fd,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gint                    g_unix_connection_receive_fd                    (GUnixConnection      *connection,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_unix_connection_send_credentials              (GUnixConnection      *connection,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_2_32
-void                    g_unix_connection_send_credentials_async        (GUnixConnection      *connection,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_unix_connection_send_credentials_finish       (GUnixConnection      *connection,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-
-GLIB_AVAILABLE_IN_2_32
-GCredentials           *g_unix_connection_receive_credentials           (GUnixConnection      *connection,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_2_32
-void                    g_unix_connection_receive_credentials_async     (GUnixConnection      *connection,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GCredentials           *g_unix_connection_receive_credentials_finish    (GUnixConnection      *connection,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_CONNECTION_H__ */
diff --git a/linux-x86/include/gio-unix-2.0/gio/gunixcredentialsmessage.h b/linux-x86/include/gio-unix-2.0/gio/gunixcredentialsmessage.h
deleted file mode 100644
index 17b4a31..0000000
--- a/linux-x86/include/gio-unix-2.0/gio/gunixcredentialsmessage.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- * Copyright (C) 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_UNIX_CREDENTIALS_MESSAGE_H__
-#define __G_UNIX_CREDENTIALS_MESSAGE_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_UNIX_CREDENTIALS_MESSAGE         (g_unix_credentials_message_get_type ())
-#define G_UNIX_CREDENTIALS_MESSAGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_UNIX_CREDENTIALS_MESSAGE, GUnixCredentialsMessage))
-#define G_UNIX_CREDENTIALS_MESSAGE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), G_TYPE_UNIX_CREDENTIALS_MESSAGE, GUnixCredentialsMessageClass))
-#define G_IS_UNIX_CREDENTIALS_MESSAGE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNIX_CREDENTIALS_MESSAGE))
-#define G_IS_UNIX_CREDENTIALS_MESSAGE_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), G_TYPE_UNIX_CREDENTIALS_MESSAGE))
-#define G_UNIX_CREDENTIALS_MESSAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_UNIX_CREDENTIALS_MESSAGE, GUnixCredentialsMessageClass))
-
-typedef struct _GUnixCredentialsMessagePrivate  GUnixCredentialsMessagePrivate;
-typedef struct _GUnixCredentialsMessageClass    GUnixCredentialsMessageClass;
-
-/**
- * GUnixCredentialsMessageClass:
- *
- * Class structure for #GUnixCredentialsMessage.
- *
- * Since: 2.26
- */
-struct _GUnixCredentialsMessageClass
-{
-  GSocketControlMessageClass parent_class;
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-};
-
-/**
- * GUnixCredentialsMessage:
- *
- * The #GUnixCredentialsMessage structure contains only private data
- * and should only be accessed using the provided API.
- *
- * Since: 2.26
- */
-struct _GUnixCredentialsMessage
-{
-  GSocketControlMessage parent_instance;
-  GUnixCredentialsMessagePrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                  g_unix_credentials_message_get_type             (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GSocketControlMessage *g_unix_credentials_message_new                  (void);
-GLIB_AVAILABLE_IN_ALL
-GSocketControlMessage *g_unix_credentials_message_new_with_credentials (GCredentials *credentials);
-GLIB_AVAILABLE_IN_ALL
-GCredentials          *g_unix_credentials_message_get_credentials      (GUnixCredentialsMessage *message);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_unix_credentials_message_is_supported         (void);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_CREDENTIALS_MESSAGE_H__ */
diff --git a/linux-x86/include/gio-unix-2.0/gio/gunixfdlist.h b/linux-x86/include/gio-unix-2.0/gio/gunixfdlist.h
deleted file mode 100644
index 6bbfb48..0000000
--- a/linux-x86/include/gio-unix-2.0/gio/gunixfdlist.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_UNIX_FD_LIST_H__
-#define __G_UNIX_FD_LIST_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_UNIX_FD_LIST                                 (g_unix_fd_list_get_type ())
-#define G_UNIX_FD_LIST(inst)                                (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_UNIX_FD_LIST, GUnixFDList))
-#define G_UNIX_FD_LIST_CLASS(class)                         (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_UNIX_FD_LIST, GUnixFDListClass))
-#define G_IS_UNIX_FD_LIST(inst)                             (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_UNIX_FD_LIST))
-#define G_IS_UNIX_FD_LIST_CLASS(class)                      (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_UNIX_FD_LIST))
-#define G_UNIX_FD_LIST_GET_CLASS(inst)                      (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_UNIX_FD_LIST, GUnixFDListClass))
-
-typedef struct _GUnixFDListPrivate                       GUnixFDListPrivate;
-typedef struct _GUnixFDListClass                         GUnixFDListClass;
-
-struct _GUnixFDListClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-struct _GUnixFDList
-{
-  GObject parent_instance;
-  GUnixFDListPrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_unix_fd_list_get_type                         (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GUnixFDList *           g_unix_fd_list_new                              (void);
-GLIB_AVAILABLE_IN_ALL
-GUnixFDList *           g_unix_fd_list_new_from_array                   (const gint   *fds,
-                                                                         gint          n_fds);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_unix_fd_list_append                           (GUnixFDList  *list,
-                                                                         gint          fd,
-                                                                         GError      **error);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_unix_fd_list_get_length                       (GUnixFDList  *list);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_unix_fd_list_get                              (GUnixFDList  *list,
-                                                                         gint          index_,
-                                                                         GError      **error);
-
-GLIB_AVAILABLE_IN_ALL
-const gint *            g_unix_fd_list_peek_fds                         (GUnixFDList  *list,
-                                                                         gint         *length);
-
-GLIB_AVAILABLE_IN_ALL
-gint *                  g_unix_fd_list_steal_fds                        (GUnixFDList  *list,
-                                                                         gint         *length);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_FD_LIST_H__ */
diff --git a/linux-x86/include/gio-unix-2.0/gio/gunixfdmessage.h b/linux-x86/include/gio-unix-2.0/gio/gunixfdmessage.h
deleted file mode 100644
index 41f9b0a..0000000
--- a/linux-x86/include/gio-unix-2.0/gio/gunixfdmessage.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_UNIX_FD_MESSAGE_H__
-#define __G_UNIX_FD_MESSAGE_H__
-
-#include <gio/gio.h>
-#include <gio/gunixfdlist.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_UNIX_FD_MESSAGE                              (g_unix_fd_message_get_type ())
-#define G_UNIX_FD_MESSAGE(inst)                             (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_UNIX_FD_MESSAGE, GUnixFDMessage))
-#define G_UNIX_FD_MESSAGE_CLASS(class)                      (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_UNIX_FD_MESSAGE, GUnixFDMessageClass))
-#define G_IS_UNIX_FD_MESSAGE(inst)                          (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_UNIX_FD_MESSAGE))
-#define G_IS_UNIX_FD_MESSAGE_CLASS(class)                   (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_UNIX_FD_MESSAGE))
-#define G_UNIX_FD_MESSAGE_GET_CLASS(inst)                   (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_UNIX_FD_MESSAGE, GUnixFDMessageClass))
-
-typedef struct _GUnixFDMessagePrivate                       GUnixFDMessagePrivate;
-typedef struct _GUnixFDMessageClass                         GUnixFDMessageClass;
-typedef struct _GUnixFDMessage                              GUnixFDMessage;
-
-struct _GUnixFDMessageClass
-{
-  GSocketControlMessageClass parent_class;
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-};
-
-struct _GUnixFDMessage
-{
-  GSocketControlMessage parent_instance;
-  GUnixFDMessagePrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_unix_fd_message_get_type                      (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GSocketControlMessage * g_unix_fd_message_new_with_fd_list              (GUnixFDList     *fd_list);
-GLIB_AVAILABLE_IN_ALL
-GSocketControlMessage * g_unix_fd_message_new                           (void);
-
-GLIB_AVAILABLE_IN_ALL
-GUnixFDList *           g_unix_fd_message_get_fd_list                   (GUnixFDMessage  *message);
-
-GLIB_AVAILABLE_IN_ALL
-gint *                  g_unix_fd_message_steal_fds                     (GUnixFDMessage  *message,
-                                                                         gint            *length);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_unix_fd_message_append_fd                     (GUnixFDMessage  *message,
-                                                                         gint             fd,
-                                                                         GError         **error);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_FD_MESSAGE_H__ */
diff --git a/linux-x86/include/gio-unix-2.0/gio/gunixinputstream.h b/linux-x86/include/gio-unix-2.0/gio/gunixinputstream.h
deleted file mode 100644
index a8beb88..0000000
--- a/linux-x86/include/gio-unix-2.0/gio/gunixinputstream.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_UNIX_INPUT_STREAM_H__
-#define __G_UNIX_INPUT_STREAM_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_UNIX_INPUT_STREAM         (g_unix_input_stream_get_type ())
-#define G_UNIX_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_UNIX_INPUT_STREAM, GUnixInputStream))
-#define G_UNIX_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_UNIX_INPUT_STREAM, GUnixInputStreamClass))
-#define G_IS_UNIX_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNIX_INPUT_STREAM))
-#define G_IS_UNIX_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNIX_INPUT_STREAM))
-#define G_UNIX_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_UNIX_INPUT_STREAM, GUnixInputStreamClass))
-
-/**
- * GUnixInputStream:
- *
- * Implements #GInputStream for reading from selectable unix file descriptors
- **/
-typedef struct _GUnixInputStream         GUnixInputStream;
-typedef struct _GUnixInputStreamClass    GUnixInputStreamClass;
-typedef struct _GUnixInputStreamPrivate  GUnixInputStreamPrivate;
-
-struct _GUnixInputStream
-{
-  GInputStream parent_instance;
-
-  /*< private >*/
-  GUnixInputStreamPrivate *priv;
-};
-
-struct _GUnixInputStreamClass
-{
-  GInputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType          g_unix_input_stream_get_type     (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GInputStream * g_unix_input_stream_new          (gint              fd,
-                                                 gboolean          close_fd);
-GLIB_AVAILABLE_IN_ALL
-void           g_unix_input_stream_set_close_fd (GUnixInputStream *stream,
-                                                 gboolean          close_fd);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_input_stream_get_close_fd (GUnixInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
-gint           g_unix_input_stream_get_fd       (GUnixInputStream *stream);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_INPUT_STREAM_H__ */
diff --git a/linux-x86/include/gio-unix-2.0/gio/gunixmounts.h b/linux-x86/include/gio-unix-2.0/gio/gunixmounts.h
deleted file mode 100644
index bd269a3..0000000
--- a/linux-x86/include/gio-unix-2.0/gio/gunixmounts.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_UNIX_MOUNTS_H__
-#define __G_UNIX_MOUNTS_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-/**
- * GUnixMountEntry:
- *
- * Defines a Unix mount entry (e.g. <filename>/media/cdrom</filename>).
- * This corresponds roughly to a mtab entry.
- **/
-typedef struct _GUnixMountEntry GUnixMountEntry;
-
-/**
- * GUnixMountPoint:
- *
- * Defines a Unix mount point (e.g. <filename>/dev</filename>).
- * This corresponds roughly to a fstab entry.
- **/
-typedef struct _GUnixMountPoint GUnixMountPoint;
-
-/**
- * GUnixMountMonitor:
- *
- * Watches #GUnixMount<!-- -->s for changes.
- **/
-typedef struct _GUnixMountMonitor      GUnixMountMonitor;
-typedef struct _GUnixMountMonitorClass GUnixMountMonitorClass;
-
-#define G_TYPE_UNIX_MOUNT_MONITOR        (g_unix_mount_monitor_get_type ())
-#define G_UNIX_MOUNT_MONITOR(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_UNIX_MOUNT_MONITOR, GUnixMountMonitor))
-#define G_UNIX_MOUNT_MONITOR_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_UNIX_MOUNT_MONITOR, GUnixMountMonitorClass))
-#define G_IS_UNIX_MOUNT_MONITOR(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNIX_MOUNT_MONITOR))
-#define G_IS_UNIX_MOUNT_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNIX_MOUNT_MONITOR))
-
-GLIB_AVAILABLE_IN_ALL
-void           g_unix_mount_free                    (GUnixMountEntry    *mount_entry);
-GLIB_AVAILABLE_IN_ALL
-void           g_unix_mount_point_free              (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_ALL
-gint           g_unix_mount_compare                 (GUnixMountEntry    *mount1,
-						     GUnixMountEntry    *mount2);
-GLIB_AVAILABLE_IN_ALL
-const char *   g_unix_mount_get_mount_path          (GUnixMountEntry    *mount_entry);
-GLIB_AVAILABLE_IN_ALL
-const char *   g_unix_mount_get_device_path         (GUnixMountEntry    *mount_entry);
-GLIB_AVAILABLE_IN_ALL
-const char *   g_unix_mount_get_fs_type             (GUnixMountEntry    *mount_entry);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_mount_is_readonly             (GUnixMountEntry    *mount_entry);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_mount_is_system_internal      (GUnixMountEntry    *mount_entry);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_mount_guess_can_eject         (GUnixMountEntry    *mount_entry);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_mount_guess_should_display    (GUnixMountEntry    *mount_entry);
-GLIB_AVAILABLE_IN_ALL
-char *         g_unix_mount_guess_name              (GUnixMountEntry    *mount_entry);
-GLIB_AVAILABLE_IN_ALL
-GIcon *        g_unix_mount_guess_icon              (GUnixMountEntry    *mount_entry);
-GLIB_AVAILABLE_IN_ALL
-GIcon *        g_unix_mount_guess_symbolic_icon     (GUnixMountEntry    *mount_entry);
-
-
-GLIB_AVAILABLE_IN_ALL
-gint           g_unix_mount_point_compare           (GUnixMountPoint    *mount1,
-						     GUnixMountPoint    *mount2);
-GLIB_AVAILABLE_IN_ALL
-const char *   g_unix_mount_point_get_mount_path    (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_ALL
-const char *   g_unix_mount_point_get_device_path   (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_ALL
-const char *   g_unix_mount_point_get_fs_type       (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_2_32
-const char *   g_unix_mount_point_get_options       (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_mount_point_is_readonly       (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_mount_point_is_user_mountable (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_mount_point_is_loopback       (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_mount_point_guess_can_eject   (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_ALL
-char *         g_unix_mount_point_guess_name        (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_ALL
-GIcon *        g_unix_mount_point_guess_icon        (GUnixMountPoint    *mount_point);
-GLIB_AVAILABLE_IN_ALL
-GIcon *        g_unix_mount_point_guess_symbolic_icon (GUnixMountPoint    *mount_point);
-
-
-GLIB_AVAILABLE_IN_ALL
-GList *        g_unix_mount_points_get              (guint64            *time_read);
-GLIB_AVAILABLE_IN_ALL
-GList *        g_unix_mounts_get                    (guint64            *time_read);
-GLIB_AVAILABLE_IN_ALL
-GUnixMountEntry *g_unix_mount_at                    (const char         *mount_path,
-						     guint64            *time_read);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_mounts_changed_since          (guint64             time);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_unix_mount_points_changed_since    (guint64             time);
-
-GLIB_AVAILABLE_IN_ALL
-GType              g_unix_mount_monitor_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GUnixMountMonitor *g_unix_mount_monitor_new            (void);
-GLIB_AVAILABLE_IN_ALL
-void               g_unix_mount_monitor_set_rate_limit (GUnixMountMonitor *mount_monitor,
-                                                        int                limit_msec);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unix_is_mount_path_system_internal (const char *mount_path);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_MOUNTS_H__ */
diff --git a/linux-x86/include/gio-unix-2.0/gio/gunixoutputstream.h b/linux-x86/include/gio-unix-2.0/gio/gunixoutputstream.h
deleted file mode 100644
index 9ef2e52..0000000
--- a/linux-x86/include/gio-unix-2.0/gio/gunixoutputstream.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_UNIX_OUTPUT_STREAM_H__
-#define __G_UNIX_OUTPUT_STREAM_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_UNIX_OUTPUT_STREAM         (g_unix_output_stream_get_type ())
-#define G_UNIX_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_UNIX_OUTPUT_STREAM, GUnixOutputStream))
-#define G_UNIX_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_UNIX_OUTPUT_STREAM, GUnixOutputStreamClass))
-#define G_IS_UNIX_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNIX_OUTPUT_STREAM))
-#define G_IS_UNIX_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNIX_OUTPUT_STREAM))
-#define G_UNIX_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_UNIX_OUTPUT_STREAM, GUnixOutputStreamClass))
-
-/**
- * GUnixOutputStream:
- *
- * Implements #GOutputStream for outputting to selectable unix file descriptors
- **/
-typedef struct _GUnixOutputStream         GUnixOutputStream;
-typedef struct _GUnixOutputStreamClass    GUnixOutputStreamClass;
-typedef struct _GUnixOutputStreamPrivate  GUnixOutputStreamPrivate;
-
-struct _GUnixOutputStream
-{
-  GOutputStream parent_instance;
-
-  /*< private >*/
-  GUnixOutputStreamPrivate *priv;
-};
-
-struct _GUnixOutputStreamClass
-{
-  GOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType           g_unix_output_stream_get_type     (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GOutputStream * g_unix_output_stream_new          (gint     fd,
-                                                   gboolean close_fd);
-GLIB_AVAILABLE_IN_ALL
-void            g_unix_output_stream_set_close_fd (GUnixOutputStream *stream,
-                                                   gboolean           close_fd);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_unix_output_stream_get_close_fd (GUnixOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
-gint            g_unix_output_stream_get_fd       (GUnixOutputStream *stream);
-G_END_DECLS
-
-#endif /* __G_UNIX_OUTPUT_STREAM_H__ */
diff --git a/linux-x86/include/gio-unix-2.0/gio/gunixsocketaddress.h b/linux-x86/include/gio-unix-2.0/gio/gunixsocketaddress.h
deleted file mode 100644
index 39d5821..0000000
--- a/linux-x86/include/gio-unix-2.0/gio/gunixsocketaddress.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- */
-
-#ifndef __G_UNIX_SOCKET_ADDRESS_H__
-#define __G_UNIX_SOCKET_ADDRESS_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_UNIX_SOCKET_ADDRESS         (g_unix_socket_address_get_type ())
-#define G_UNIX_SOCKET_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_UNIX_SOCKET_ADDRESS, GUnixSocketAddress))
-#define G_UNIX_SOCKET_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_UNIX_SOCKET_ADDRESS, GUnixSocketAddressClass))
-#define G_IS_UNIX_SOCKET_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNIX_SOCKET_ADDRESS))
-#define G_IS_UNIX_SOCKET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNIX_SOCKET_ADDRESS))
-#define G_UNIX_SOCKET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_UNIX_SOCKET_ADDRESS, GUnixSocketAddressClass))
-
-typedef struct _GUnixSocketAddress        GUnixSocketAddress;
-typedef struct _GUnixSocketAddressClass   GUnixSocketAddressClass;
-typedef struct _GUnixSocketAddressPrivate GUnixSocketAddressPrivate;
-
-struct _GUnixSocketAddress
-{
-  GSocketAddress parent_instance;
-
-  /*< private >*/
-  GUnixSocketAddressPrivate *priv;
-};
-
-struct _GUnixSocketAddressClass
-{
-  GSocketAddressClass parent_class;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType           g_unix_socket_address_get_type    (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress *g_unix_socket_address_new             (const gchar        *path);
-GLIB_DEPRECATED_FOR(g_unix_socket_address_new_with_type)
-GSocketAddress *g_unix_socket_address_new_abstract    (const gchar        *path,
-                                                       gint                path_len);
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress *g_unix_socket_address_new_with_type   (const gchar            *path,
-                                                       gint                    path_len,
-                                                       GUnixSocketAddressType  type);
-GLIB_AVAILABLE_IN_ALL
-const char *    g_unix_socket_address_get_path        (GUnixSocketAddress *address);
-GLIB_AVAILABLE_IN_ALL
-gsize           g_unix_socket_address_get_path_len    (GUnixSocketAddress *address);
-GLIB_AVAILABLE_IN_ALL
-GUnixSocketAddressType g_unix_socket_address_get_address_type (GUnixSocketAddress *address);
-GLIB_DEPRECATED
-gboolean        g_unix_socket_address_get_is_abstract (GUnixSocketAddress *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_unix_socket_address_abstract_names_supported (void);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_SOCKET_ADDRESS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gaction.h b/linux-x86/include/glib-2.0/gio/gaction.h
deleted file mode 100644
index f8e92ff..0000000
--- a/linux-x86/include/glib-2.0/gio/gaction.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_ACTION_H__
-#define __G_ACTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ACTION                                       (g_action_get_type ())
-#define G_ACTION(inst)                                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_ACTION, GAction))
-#define G_IS_ACTION(inst)                                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_ACTION))
-#define G_ACTION_GET_IFACE(inst)                            (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
-                                                             G_TYPE_ACTION, GActionInterface))
-
-typedef struct _GActionInterface                            GActionInterface;
-
-struct _GActionInterface
-{
-  GTypeInterface g_iface;
-
-  /* virtual functions */
-  const gchar *        (* get_name)             (GAction  *action);
-  const GVariantType * (* get_parameter_type)   (GAction  *action);
-  const GVariantType * (* get_state_type)       (GAction  *action);
-  GVariant *           (* get_state_hint)       (GAction  *action);
-
-  gboolean             (* get_enabled)          (GAction  *action);
-  GVariant *           (* get_state)            (GAction  *action);
-
-  void                 (* change_state)         (GAction  *action,
-                                                 GVariant *value);
-  void                 (* activate)             (GAction  *action,
-                                                 GVariant *parameter);
-};
-
-GLIB_AVAILABLE_IN_2_30
-GType                   g_action_get_type                               (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *           g_action_get_name                               (GAction            *action);
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *    g_action_get_parameter_type                     (GAction            *action);
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *    g_action_get_state_type                         (GAction            *action);
-GLIB_AVAILABLE_IN_ALL
-GVariant *              g_action_get_state_hint                         (GAction            *action);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_action_get_enabled                            (GAction            *action);
-GLIB_AVAILABLE_IN_ALL
-GVariant *              g_action_get_state                              (GAction            *action);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_action_change_state                           (GAction            *action,
-                                                                         GVariant           *value);
-GLIB_AVAILABLE_IN_ALL
-void                    g_action_activate                               (GAction            *action,
-                                                                         GVariant           *parameter);
-
-GLIB_AVAILABLE_IN_2_28
-gboolean                g_action_name_is_valid                          (const gchar        *action_name);
-
-GLIB_AVAILABLE_IN_2_38
-gboolean                g_action_parse_detailed_name                    (const gchar        *detailed_name,
-                                                                         gchar             **action_name,
-                                                                         GVariant          **target_value,
-                                                                         GError            **error);
-
-GLIB_AVAILABLE_IN_2_38
-gchar *                 g_action_print_detailed_name                    (const gchar        *action_name,
-                                                                         GVariant           *parameter);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gactiongroup.h b/linux-x86/include/glib-2.0/gio/gactiongroup.h
deleted file mode 100644
index 9fc3b2b..0000000
--- a/linux-x86/include/glib-2.0/gio/gactiongroup.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_ACTION_GROUP_H__
-#define __G_ACTION_GROUP_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_ACTION_GROUP                                 (g_action_group_get_type ())
-#define G_ACTION_GROUP(inst)                                (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_ACTION_GROUP, GActionGroup))
-#define G_IS_ACTION_GROUP(inst)                             (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_ACTION_GROUP))
-#define G_ACTION_GROUP_GET_IFACE(inst)                      (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
-                                                             G_TYPE_ACTION_GROUP, GActionGroupInterface))
-
-typedef struct _GActionGroupInterface                       GActionGroupInterface;
-
-struct _GActionGroupInterface
-{
-  GTypeInterface g_iface;
-
-  /* virtual functions */
-  gboolean              (* has_action)                 (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  gchar **              (* list_actions)               (GActionGroup  *action_group);
-
-  gboolean              (* get_action_enabled)         (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  const GVariantType *  (* get_action_parameter_type)  (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  const GVariantType *  (* get_action_state_type)      (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  GVariant *            (* get_action_state_hint)      (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  GVariant *            (* get_action_state)           (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  void                  (* change_action_state)        (GActionGroup  *action_group,
-                                                        const gchar   *action_name,
-                                                        GVariant      *value);
-
-  void                  (* activate_action)            (GActionGroup  *action_group,
-                                                        const gchar   *action_name,
-                                                        GVariant      *parameter);
-
-  /* signals */
-  void                  (* action_added)               (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-  void                  (* action_removed)             (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-  void                  (* action_enabled_changed)     (GActionGroup  *action_group,
-                                                        const gchar   *action_name,
-                                                        gboolean       enabled);
-  void                  (* action_state_changed)       (GActionGroup   *action_group,
-                                                        const gchar    *action_name,
-                                                        GVariant       *state);
-
-  /* more virtual functions */
-  gboolean              (* query_action)               (GActionGroup        *action_group,
-                                                        const gchar         *action_name,
-                                                        gboolean            *enabled,
-                                                        const GVariantType **parameter_type,
-                                                        const GVariantType **state_type,
-                                                        GVariant           **state_hint,
-                                                        GVariant           **state);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_action_group_get_type                         (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_action_group_has_action                       (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-GLIB_AVAILABLE_IN_ALL
-gchar **                g_action_group_list_actions                     (GActionGroup *action_group);
-
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *    g_action_group_get_action_parameter_type        (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *    g_action_group_get_action_state_type            (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-GLIB_AVAILABLE_IN_ALL
-GVariant *              g_action_group_get_action_state_hint            (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_action_group_get_action_enabled               (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-
-GLIB_AVAILABLE_IN_ALL
-GVariant *              g_action_group_get_action_state                 (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-GLIB_AVAILABLE_IN_ALL
-void                    g_action_group_change_action_state              (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         GVariant     *value);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_action_group_activate_action                  (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         GVariant     *parameter);
-
-/* signals */
-GLIB_AVAILABLE_IN_ALL
-void                    g_action_group_action_added                     (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-GLIB_AVAILABLE_IN_ALL
-void                    g_action_group_action_removed                   (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-GLIB_AVAILABLE_IN_ALL
-void                    g_action_group_action_enabled_changed           (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         gboolean      enabled);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_action_group_action_state_changed             (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         GVariant     *state);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_action_group_query_action                     (GActionGroup        *action_group,
-                                                                         const gchar         *action_name,
-                                                                         gboolean            *enabled,
-                                                                         const GVariantType **parameter_type,
-                                                                         const GVariantType **state_type,
-                                                                         GVariant           **state_hint,
-                                                                         GVariant           **state);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_GROUP_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gactiongroupexporter.h b/linux-x86/include/glib-2.0/gio/gactiongroupexporter.h
deleted file mode 100644
index 31f21f2..0000000
--- a/linux-x86/include/glib-2.0/gio/gactiongroupexporter.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- * Copyright © 2011 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-
-#ifndef __G_ACTION_GROUP_EXPORTER_H__
-#define __G_ACTION_GROUP_EXPORTER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_2_32
-guint                   g_dbus_connection_export_action_group           (GDBusConnection  *connection,
-                                                                         const gchar      *object_path,
-                                                                         GActionGroup     *action_group,
-                                                                         GError          **error);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_dbus_connection_unexport_action_group         (GDBusConnection  *connection,
-                                                                         guint             export_id);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_GROUP_EXPORTER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gactionmap.h b/linux-x86/include/glib-2.0/gio/gactionmap.h
deleted file mode 100644
index 93451a8..0000000
--- a/linux-x86/include/glib-2.0/gio/gactionmap.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_ACTION_MAP_H__
-#define __G_ACTION_MAP_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_ACTION_MAP                                   (g_action_map_get_type ())
-#define G_ACTION_MAP(inst)                                  (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
-                                                             G_TYPE_ACTION_MAP, GActionMap))
-#define G_IS_ACTION_MAP(inst)                               (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
-                                                             G_TYPE_ACTION_MAP))
-#define G_ACTION_MAP_GET_IFACE(inst)                        (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                   \
-                                                             G_TYPE_ACTION_MAP, GActionMapInterface))
-
-typedef struct _GActionMapInterface                         GActionMapInterface;
-typedef struct _GActionEntry                                GActionEntry;
-
-struct _GActionMapInterface
-{
-  GTypeInterface g_iface;
-
-  GAction * (* lookup_action) (GActionMap  *action_map,
-                               const gchar *action_name);
-  void      (* add_action)    (GActionMap  *action_map,
-                               GAction     *action);
-  void      (* remove_action) (GActionMap  *action_map,
-                               const gchar *action_name);
-};
-
-struct _GActionEntry
-{
-  const gchar *name;
-
-  void (* activate) (GSimpleAction *action,
-                     GVariant      *parameter,
-                     gpointer       user_data);
-
-  const gchar *parameter_type;
-
-  const gchar *state;
-
-  void (* change_state) (GSimpleAction *action,
-                         GVariant      *value,
-                         gpointer       user_data);
-
-  /*< private >*/
-  gsize padding[3];
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType                   g_action_map_get_type                           (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GAction *               g_action_map_lookup_action                      (GActionMap         *action_map,
-                                                                         const gchar        *action_name);
-GLIB_AVAILABLE_IN_2_32
-void                    g_action_map_add_action                         (GActionMap         *action_map,
-                                                                         GAction            *action);
-GLIB_AVAILABLE_IN_2_32
-void                    g_action_map_remove_action                      (GActionMap         *action_map,
-                                                                         const gchar        *action_name);
-GLIB_AVAILABLE_IN_2_32
-void                    g_action_map_add_action_entries                 (GActionMap         *action_map,
-                                                                         const GActionEntry *entries,
-                                                                         gint                n_entries,
-                                                                         gpointer            user_data);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_MAP_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gappinfo.h b/linux-x86/include/glib-2.0/gio/gappinfo.h
deleted file mode 100644
index baed4c4..0000000
--- a/linux-x86/include/glib-2.0/gio/gappinfo.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_APP_INFO_H__
-#define __G_APP_INFO_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APP_INFO            (g_app_info_get_type ())
-#define G_APP_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_APP_INFO, GAppInfo))
-#define G_IS_APP_INFO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_APP_INFO))
-#define G_APP_INFO_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_APP_INFO, GAppInfoIface))
-
-#define G_TYPE_APP_LAUNCH_CONTEXT         (g_app_launch_context_get_type ())
-#define G_APP_LAUNCH_CONTEXT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContext))
-#define G_APP_LAUNCH_CONTEXT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContextClass))
-#define G_IS_APP_LAUNCH_CONTEXT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_APP_LAUNCH_CONTEXT))
-#define G_IS_APP_LAUNCH_CONTEXT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_APP_LAUNCH_CONTEXT))
-#define G_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContextClass))
-
-typedef struct _GAppLaunchContextClass   GAppLaunchContextClass;
-typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate;
-
-/**
- * GAppInfo:
- *
- * Information about an installed application and methods to launch
- * it (with file arguments).
- */
-
-/**
- * GAppInfoIface:
- * @g_iface: The parent interface.
- * @dup: Copies a #GAppInfo.
- * @equal: Checks two #GAppInfo<!-- -->s for equality.
- * @get_id: Gets a string identifier for a #GAppInfo.
- * @get_name: Gets the name of the application for a #GAppInfo.
- * @get_description: Gets a short description for the application described by the #GAppInfo.
- * @get_executable: Gets the executable name for the #GAppInfo.
- * @get_icon: Gets the #GIcon for the #GAppInfo.
- * @launch: Launches an application specified by the #GAppInfo.
- * @supports_uris: Indicates whether the application specified supports launching URIs.
- * @supports_files: Indicates whether the application specified accepts filename arguments.
- * @launch_uris: Launches an application with a list of URIs.
- * @should_show: Returns whether an application should be shown (e.g. when getting a list of installed applications).
- * <ulink url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">
- * <citetitle>FreeDesktop.Org Startup Notification Specification</citetitle></ulink>.
- * @set_as_default_for_type: Sets an application as default for a given content type.
- * @set_as_default_for_extension: Sets an application as default for a given file extension.
- * @add_supports_type: Adds to the #GAppInfo information about supported file types.
- * @can_remove_supports_type: Checks for support for removing supported file types from a #GAppInfo.
- * @remove_supports_type: Removes a supported application type from a #GAppInfo.
- * @can_delete: Checks if a #GAppInfo can be deleted. Since 2.20
- * @do_delete: Deletes a #GAppInfo. Since 2.20
- * @get_commandline: Gets the commandline for the #GAppInfo. Since 2.20
- * @get_display_name: Gets the display name for the #GAppInfo. Since 2.24
- * @set_as_last_used_for_type: Sets the application as the last used. See g_app_info_set_as_last_used_for_type().
- *
- * Application Information interface, for operating system portability.
- */
-typedef struct _GAppInfoIface    GAppInfoIface;
-
-struct _GAppInfoIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GAppInfo *   (* dup)                          (GAppInfo           *appinfo);
-  gboolean     (* equal)                        (GAppInfo           *appinfo1,
-                                                 GAppInfo           *appinfo2);
-  const char * (* get_id)                       (GAppInfo           *appinfo);
-  const char * (* get_name)                     (GAppInfo           *appinfo);
-  const char * (* get_description)              (GAppInfo           *appinfo);
-  const char * (* get_executable)               (GAppInfo           *appinfo);
-  GIcon *      (* get_icon)                     (GAppInfo           *appinfo);
-  gboolean     (* launch)                       (GAppInfo           *appinfo,
-                                                 GList              *files,
-                                                 GAppLaunchContext  *launch_context,
-                                                 GError            **error);
-  gboolean     (* supports_uris)                (GAppInfo           *appinfo);
-  gboolean     (* supports_files)               (GAppInfo           *appinfo);
-  gboolean     (* launch_uris)                  (GAppInfo           *appinfo,
-                                                 GList              *uris,
-                                                 GAppLaunchContext  *launch_context,
-                                                 GError            **error);
-  gboolean     (* should_show)                  (GAppInfo           *appinfo);
-
-  /* For changing associations */
-  gboolean     (* set_as_default_for_type)      (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  gboolean     (* set_as_default_for_extension) (GAppInfo           *appinfo,
-                                                 const char         *extension,
-                                                 GError            **error);
-  gboolean     (* add_supports_type)            (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  gboolean     (* can_remove_supports_type)     (GAppInfo           *appinfo);
-  gboolean     (* remove_supports_type)         (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  gboolean     (* can_delete)                   (GAppInfo           *appinfo);
-  gboolean     (* do_delete)                    (GAppInfo           *appinfo);
-  const char * (* get_commandline)              (GAppInfo           *appinfo);
-  const char * (* get_display_name)             (GAppInfo           *appinfo);
-  gboolean     (* set_as_last_used_for_type)    (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  const char ** (* get_supported_types)         (GAppInfo           *appinfo);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType       g_app_info_get_type                     (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GAppInfo *  g_app_info_create_from_commandline      (const char           *commandline,
-                                                     const char           *application_name,
-                                                     GAppInfoCreateFlags   flags,
-                                                     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-GAppInfo *  g_app_info_dup                          (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_equal                        (GAppInfo             *appinfo1,
-                                                     GAppInfo             *appinfo2);
-GLIB_AVAILABLE_IN_ALL
-const char *g_app_info_get_id                       (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-const char *g_app_info_get_name                     (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-const char *g_app_info_get_display_name             (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-const char *g_app_info_get_description              (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-const char *g_app_info_get_executable               (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-const char *g_app_info_get_commandline              (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-GIcon *     g_app_info_get_icon                     (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_launch                       (GAppInfo             *appinfo,
-                                                     GList                *files,
-                                                     GAppLaunchContext    *launch_context,
-                                                     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_supports_uris                (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_supports_files               (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_launch_uris                  (GAppInfo             *appinfo,
-                                                     GList                *uris,
-                                                     GAppLaunchContext    *launch_context,
-                                                     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_should_show                  (GAppInfo             *appinfo);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_set_as_default_for_type      (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_set_as_default_for_extension (GAppInfo             *appinfo,
-                                                     const char           *extension,
-                                                     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_add_supports_type            (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_can_remove_supports_type     (GAppInfo             *appinfo);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_remove_supports_type         (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-GLIB_AVAILABLE_IN_2_34
-const char **g_app_info_get_supported_types         (GAppInfo             *appinfo);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_can_delete                   (GAppInfo   *appinfo);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_delete                       (GAppInfo   *appinfo);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_app_info_set_as_last_used_for_type    (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-GList *   g_app_info_get_all                     (void);
-GLIB_AVAILABLE_IN_ALL
-GList *   g_app_info_get_all_for_type            (const char  *content_type);
-GLIB_AVAILABLE_IN_ALL
-GList *   g_app_info_get_recommended_for_type    (const gchar *content_type);
-GLIB_AVAILABLE_IN_ALL
-GList *   g_app_info_get_fallback_for_type       (const gchar *content_type);
-
-GLIB_AVAILABLE_IN_ALL
-void      g_app_info_reset_type_associations     (const char  *content_type);
-GLIB_AVAILABLE_IN_ALL
-GAppInfo *g_app_info_get_default_for_type        (const char  *content_type,
-                                                  gboolean     must_support_uris);
-GLIB_AVAILABLE_IN_ALL
-GAppInfo *g_app_info_get_default_for_uri_scheme  (const char  *uri_scheme);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_app_info_launch_default_for_uri      (const char              *uri,
-                                                  GAppLaunchContext       *launch_context,
-                                                  GError                 **error);
-
-/**
- * GAppLaunchContext:
- *
- * Integrating the launch with the launching application. This is used to
- * handle for instance startup notification and launching the new application
- * on the same screen as the launching window.
- */
-struct _GAppLaunchContext
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GAppLaunchContextPrivate *priv;
-};
-
-struct _GAppLaunchContextClass
-{
-  GObjectClass parent_class;
-
-  char * (* get_display)           (GAppLaunchContext *context,
-                                    GAppInfo          *info,
-                                    GList             *files);
-  char * (* get_startup_notify_id) (GAppLaunchContext *context,
-                                    GAppInfo          *info,
-                                    GList             *files);
-  void   (* launch_failed)         (GAppLaunchContext *context,
-                                    const char        *startup_notify_id);
-  void   (* launched)              (GAppLaunchContext *context,
-                                    GAppInfo          *info,
-                                    GVariant          *platform_data);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType              g_app_launch_context_get_type              (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GAppLaunchContext *g_app_launch_context_new                   (void);
-
-GLIB_AVAILABLE_IN_2_32
-void               g_app_launch_context_setenv                (GAppLaunchContext *context,
-                                                               const char        *variable,
-                                                               const char        *value);
-GLIB_AVAILABLE_IN_2_32
-void               g_app_launch_context_unsetenv              (GAppLaunchContext *context,
-                                                               const char        *variable);
-GLIB_AVAILABLE_IN_2_32
-char **            g_app_launch_context_get_environment       (GAppLaunchContext *context);
-
-GLIB_AVAILABLE_IN_ALL
-char *             g_app_launch_context_get_display           (GAppLaunchContext *context,
-                                                               GAppInfo          *info,
-                                                               GList             *files);
-GLIB_AVAILABLE_IN_ALL
-char *             g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
-                                                               GAppInfo          *info,
-                                                               GList             *files);
-GLIB_AVAILABLE_IN_ALL
-void               g_app_launch_context_launch_failed         (GAppLaunchContext *context,
-                                                               const char *       startup_notify_id);
-
-G_END_DECLS
-
-#endif /* __G_APP_INFO_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gapplication.h b/linux-x86/include/glib-2.0/gio/gapplication.h
deleted file mode 100644
index 5878a7f..0000000
--- a/linux-x86/include/glib-2.0/gio/gapplication.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_APPLICATION_H__
-#define __G_APPLICATION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APPLICATION                                  (g_application_get_type ())
-#define G_APPLICATION(inst)                                 (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_APPLICATION, GApplication))
-#define G_APPLICATION_CLASS(class)                          (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_APPLICATION, GApplicationClass))
-#define G_IS_APPLICATION(inst)                              (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_APPLICATION))
-#define G_IS_APPLICATION_CLASS(class)                       (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_APPLICATION))
-#define G_APPLICATION_GET_CLASS(inst)                       (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_APPLICATION, GApplicationClass))
-
-typedef struct _GApplicationPrivate                         GApplicationPrivate;
-typedef struct _GApplicationClass                           GApplicationClass;
-
-/**
- * GApplication:
- *
- * Since: 2.28
- */
-struct _GApplication
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GApplicationPrivate *priv;
-};
-
-struct _GApplicationClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* signals */
-  void                      (* startup)             (GApplication              *application);
-
-  void                      (* activate)            (GApplication              *application);
-
-  void                      (* open)                (GApplication              *application,
-                                                     GFile                    **files,
-                                                     gint                       n_files,
-                                                     const gchar               *hint);
-
-  int                       (* command_line)        (GApplication              *application,
-                                                     GApplicationCommandLine   *command_line);
-
-  /* vfuncs */
-
-  /**
-   * GApplicationClass::local_command_line:
-   * @application: a #GApplication
-   * @arguments: (inout) (array zero-terminated=1): array of command line arguments
-   * @exit_status: (out): exit status to fill after processing the command line.
-   *
-   * This virtual function is always invoked in the local instance. It
-   * gets passed a pointer to a %NULL-terminated copy of @argv and is
-   * expected to remove arguments that it handled (shifting up remaining
-   * arguments).
-   *
-   * The last argument to local_command_line() is a pointer to the @status
-   * variable which can used to set the exit status that is returned from
-   * g_application_run().
-   *
-   * See g_application_run() for more details on #GApplication startup.
-   *
-   * Returns: %TRUE if the commandline has been completely handled
-   */
-  gboolean                  (* local_command_line)  (GApplication              *application,
-                                                     gchar                   ***arguments,
-                                                     int                       *exit_status);
-
-  void                      (* before_emit)         (GApplication              *application,
-                                                     GVariant                  *platform_data);
-  void                      (* after_emit)          (GApplication              *application,
-                                                     GVariant                  *platform_data);
-  void                      (* add_platform_data)   (GApplication              *application,
-                                                     GVariantBuilder           *builder);
-  void                      (* quit_mainloop)       (GApplication              *application);
-  void                      (* run_mainloop)        (GApplication              *application);
-  void                      (* shutdown)            (GApplication              *application);
-
-  gboolean                  (* dbus_register)       (GApplication              *application,
-                                                     GDBusConnection           *connection,
-                                                     const gchar               *object_path,
-                                                     GError                   **error);
-  void                      (* dbus_unregister)     (GApplication              *application,
-                                                     GDBusConnection           *connection,
-                                                     const gchar               *object_path);
-
-  /*< private >*/
-  gpointer padding[9];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_application_get_type                          (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_application_id_is_valid                       (const gchar              *application_id);
-
-GLIB_AVAILABLE_IN_ALL
-GApplication *          g_application_new                               (const gchar              *application_id,
-                                                                         GApplicationFlags         flags);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *           g_application_get_application_id                (GApplication             *application);
-GLIB_AVAILABLE_IN_ALL
-void                    g_application_set_application_id                (GApplication             *application,
-                                                                         const gchar              *application_id);
-
-GLIB_AVAILABLE_IN_2_34
-GDBusConnection *       g_application_get_dbus_connection               (GApplication             *application);
-GLIB_AVAILABLE_IN_2_34
-const gchar *           g_application_get_dbus_object_path              (GApplication             *application);
-
-GLIB_AVAILABLE_IN_ALL
-guint                   g_application_get_inactivity_timeout            (GApplication             *application);
-GLIB_AVAILABLE_IN_ALL
-void                    g_application_set_inactivity_timeout            (GApplication             *application,
-                                                                         guint                     inactivity_timeout);
-
-GLIB_AVAILABLE_IN_ALL
-GApplicationFlags       g_application_get_flags                         (GApplication             *application);
-GLIB_AVAILABLE_IN_ALL
-void                    g_application_set_flags                         (GApplication             *application,
-                                                                         GApplicationFlags         flags);
-
-GLIB_DEPRECATED
-void                    g_application_set_action_group                  (GApplication             *application,
-                                                                         GActionGroup             *action_group);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_application_get_is_registered                 (GApplication             *application);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_application_get_is_remote                     (GApplication             *application);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_application_register                          (GApplication             *application,
-                                                                         GCancellable             *cancellable,
-                                                                         GError                  **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_application_hold                              (GApplication             *application);
-GLIB_AVAILABLE_IN_ALL
-void                    g_application_release                           (GApplication             *application);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_application_activate                          (GApplication             *application);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_application_open                              (GApplication             *application,
-                                                                         GFile                   **files,
-                                                                         gint                      n_files,
-                                                                         const gchar              *hint);
-
-GLIB_AVAILABLE_IN_ALL
-int                     g_application_run                               (GApplication             *application,
-                                                                         int                       argc,
-                                                                         char                    **argv);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_application_quit                              (GApplication             *application);
-
-GLIB_AVAILABLE_IN_2_32
-GApplication *          g_application_get_default                       (void);
-GLIB_AVAILABLE_IN_2_32
-void                    g_application_set_default                       (GApplication             *application);
-
-GLIB_AVAILABLE_IN_2_38
-void                    g_application_mark_busy                         (GApplication             *application);
-GLIB_AVAILABLE_IN_2_38
-void                    g_application_unmark_busy                       (GApplication             *application);
-
-G_END_DECLS
-
-#endif /* __G_APPLICATION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gapplicationcommandline.h b/linux-x86/include/glib-2.0/gio/gapplicationcommandline.h
deleted file mode 100644
index 5f70d65..0000000
--- a/linux-x86/include/glib-2.0/gio/gapplicationcommandline.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_APPLICATION_COMMAND_LINE_H__
-#define __G_APPLICATION_COMMAND_LINE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APPLICATION_COMMAND_LINE                     (g_application_command_line_get_type ())
-#define G_APPLICATION_COMMAND_LINE(inst)                    (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE,                        \
-                                                             GApplicationCommandLine))
-#define G_APPLICATION_COMMAND_LINE_CLASS(class)             (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE,                        \
-                                                             GApplicationCommandLineClass))
-#define G_IS_APPLICATION_COMMAND_LINE(inst)                 (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE))
-#define G_IS_APPLICATION_COMMAND_LINE_CLASS(class)          (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE))
-#define G_APPLICATION_COMMAND_LINE_GET_CLASS(inst)          (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE,                        \
-                                                             GApplicationCommandLineClass))
-
-typedef struct _GApplicationCommandLinePrivate               GApplicationCommandLinePrivate;
-typedef struct _GApplicationCommandLineClass                 GApplicationCommandLineClass;
-
-struct _GApplicationCommandLine
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GApplicationCommandLinePrivate *priv;
-};
-
-struct _GApplicationCommandLineClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  void                  (* print_literal)       (GApplicationCommandLine *cmdline,
-                                                 const gchar             *message);
-  void                  (* printerr_literal)    (GApplicationCommandLine *cmdline,
-                                                 const gchar             *message);
-  GInputStream *        (* get_stdin)           (GApplicationCommandLine *cmdline);
-
-  gpointer padding[11];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_application_command_line_get_type             (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gchar **                g_application_command_line_get_arguments        (GApplicationCommandLine   *cmdline,
-                                                                         int                       *argc);
-
-GLIB_AVAILABLE_IN_2_36
-GInputStream *          g_application_command_line_get_stdin            (GApplicationCommandLine   *cmdline);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar * const *   g_application_command_line_get_environ          (GApplicationCommandLine   *cmdline);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *           g_application_command_line_getenv               (GApplicationCommandLine   *cmdline,
-                                                                         const gchar               *name);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *           g_application_command_line_get_cwd              (GApplicationCommandLine   *cmdline);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_application_command_line_get_is_remote        (GApplicationCommandLine   *cmdline);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_application_command_line_print                (GApplicationCommandLine   *cmdline,
-                                                                         const gchar               *format,
-                                                                         ...) G_GNUC_PRINTF(2, 3);
-GLIB_AVAILABLE_IN_ALL
-void                    g_application_command_line_printerr             (GApplicationCommandLine   *cmdline,
-                                                                         const gchar               *format,
-                                                                         ...) G_GNUC_PRINTF(2, 3);
-
-GLIB_AVAILABLE_IN_ALL
-int                     g_application_command_line_get_exit_status      (GApplicationCommandLine   *cmdline);
-GLIB_AVAILABLE_IN_ALL
-void                    g_application_command_line_set_exit_status      (GApplicationCommandLine   *cmdline,
-                                                                         int                        exit_status);
-
-GLIB_AVAILABLE_IN_ALL
-GVariant *              g_application_command_line_get_platform_data    (GApplicationCommandLine   *cmdline);
-
-GLIB_AVAILABLE_IN_2_36
-GFile *                 g_application_command_line_create_file_for_arg  (GApplicationCommandLine   *cmdline,
-                                                                         const gchar               *arg);
-
-G_END_DECLS
-
-#endif /* __G_APPLICATION_COMMAND_LINE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gasyncinitable.h b/linux-x86/include/glib-2.0/gio/gasyncinitable.h
deleted file mode 100644
index af5cfb1..0000000
--- a/linux-x86/include/glib-2.0/gio/gasyncinitable.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_ASYNC_INITABLE_H__
-#define __G_ASYNC_INITABLE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-#include <gio/ginitable.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ASYNC_INITABLE            (g_async_initable_get_type ())
-#define G_ASYNC_INITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_ASYNC_INITABLE, GAsyncInitable))
-#define G_IS_ASYNC_INITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ASYNC_INITABLE))
-#define G_ASYNC_INITABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ASYNC_INITABLE, GAsyncInitableIface))
-#define G_TYPE_IS_ASYNC_INITABLE(type)   (g_type_is_a ((type), G_TYPE_ASYNC_INITABLE))
-
-/**
- * GAsyncInitable:
- *
- * Interface for asynchronously initializable objects.
- *
- * Since: 2.22
- **/
-typedef struct _GAsyncInitableIface GAsyncInitableIface;
-
-/**
- * GAsyncInitableIface:
- * @g_iface: The parent interface.
- * @init_async: Starts initialization of the object.
- * @init_finish: Finishes initialization of the object.
- *
- * Provides an interface for asynchronous initializing object such that
- * initialization may fail.
- *
- * Since: 2.22
- **/
-struct _GAsyncInitableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  void     (* init_async)  (GAsyncInitable      *initable,
-			    int                  io_priority,
-			    GCancellable        *cancellable,
-			    GAsyncReadyCallback  callback,
-			    gpointer             user_data);
-  gboolean (* init_finish) (GAsyncInitable      *initable,
-			    GAsyncResult        *res,
-			    GError             **error);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_async_initable_get_type    (void) G_GNUC_CONST;
-
-
-GLIB_AVAILABLE_IN_ALL
-void     g_async_initable_init_async       (GAsyncInitable       *initable,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_async_initable_init_finish      (GAsyncInitable       *initable,
-					    GAsyncResult         *res,
-					    GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_async_initable_new_async        (GType                 object_type,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data,
-					    const gchar          *first_property_name,
-					    ...);
-GLIB_AVAILABLE_IN_ALL
-void     g_async_initable_newv_async       (GType                 object_type,
-					    guint                 n_parameters,
-					    GParameter           *parameters,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-void     g_async_initable_new_valist_async (GType                 object_type,
-					    const gchar          *first_property_name,
-					    va_list               var_args,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GObject *g_async_initable_new_finish       (GAsyncInitable       *initable,
-					    GAsyncResult         *res,
-					    GError              **error);
-
-
-
-G_END_DECLS
-
-
-#endif /* __G_ASYNC_INITABLE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gasyncresult.h b/linux-x86/include/glib-2.0/gio/gasyncresult.h
deleted file mode 100644
index 9c8184f..0000000
--- a/linux-x86/include/glib-2.0/gio/gasyncresult.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_ASYNC_RESULT_H__
-#define __G_ASYNC_RESULT_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ASYNC_RESULT            (g_async_result_get_type ())
-#define G_ASYNC_RESULT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_ASYNC_RESULT, GAsyncResult))
-#define G_IS_ASYNC_RESULT(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ASYNC_RESULT))
-#define G_ASYNC_RESULT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ASYNC_RESULT, GAsyncResultIface))
-
-/**
- * GAsyncResult:
- *
- * Holds results information for an asynchronous operation,
- * usually passed directly to a asynchronous _finish() operation.
- **/
-typedef struct _GAsyncResultIface    GAsyncResultIface;
-
-
-/**
- * GAsyncResultIface:
- * @g_iface: The parent interface.
- * @get_user_data: Gets the user data passed to the callback.
- * @get_source_object: Gets the source object that issued the asynchronous operation.
- * @is_tagged: Checks if a result is tagged with a particular source.
- *
- * Interface definition for #GAsyncResult.
- **/
-struct _GAsyncResultIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  gpointer  (* get_user_data)     (GAsyncResult *res);
-  GObject * (* get_source_object) (GAsyncResult *res);
-
-  gboolean  (* is_tagged)         (GAsyncResult *res,
-				   gpointer      source_tag);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_async_result_get_type          (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gpointer g_async_result_get_user_data     (GAsyncResult *res);
-GLIB_AVAILABLE_IN_ALL
-GObject *g_async_result_get_source_object (GAsyncResult *res);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean g_async_result_legacy_propagate_error (GAsyncResult  *res,
-						GError       **error);
-GLIB_AVAILABLE_IN_2_34
-gboolean g_async_result_is_tagged              (GAsyncResult  *res,
-						gpointer       source_tag);
-
-G_END_DECLS
-
-#endif /* __G_ASYNC_RESULT_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gbufferedinputstream.h b/linux-x86/include/glib-2.0/gio/gbufferedinputstream.h
deleted file mode 100644
index a4f8ef0..0000000
--- a/linux-x86/include/glib-2.0/gio/gbufferedinputstream.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#ifndef __G_BUFFERED_INPUT_STREAM_H__
-#define __G_BUFFERED_INPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gfilterinputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_BUFFERED_INPUT_STREAM         (g_buffered_input_stream_get_type ())
-#define G_BUFFERED_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_BUFFERED_INPUT_STREAM, GBufferedInputStream))
-#define G_BUFFERED_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_BUFFERED_INPUT_STREAM, GBufferedInputStreamClass))
-#define G_IS_BUFFERED_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_BUFFERED_INPUT_STREAM))
-#define G_IS_BUFFERED_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_BUFFERED_INPUT_STREAM))
-#define G_BUFFERED_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_BUFFERED_INPUT_STREAM, GBufferedInputStreamClass))
-
-/**
- * GBufferedInputStream:
- *
- * Implements #GFilterInputStream with a sized input buffer.
- **/
-typedef struct _GBufferedInputStreamClass    GBufferedInputStreamClass;
-typedef struct _GBufferedInputStreamPrivate  GBufferedInputStreamPrivate;
-
-struct _GBufferedInputStream
-{
-  GFilterInputStream parent_instance;
-
-  /*< private >*/
-  GBufferedInputStreamPrivate *priv;
-};
-
-struct _GBufferedInputStreamClass
-{
-  GFilterInputStreamClass parent_class;
-
-  gssize   (* fill)        (GBufferedInputStream *stream,
-			    gssize                count,
-			    GCancellable         *cancellable,
-			    GError              **error);
-
-  /* Async ops: (optional in derived classes) */
-  void     (* fill_async)  (GBufferedInputStream *stream,
-			    gssize                count,
-			    int                   io_priority,
-			    GCancellable         *cancellable,
-			    GAsyncReadyCallback   callback,
-			    gpointer              user_data);
-  gssize   (* fill_finish) (GBufferedInputStream *stream,
-			    GAsyncResult         *result,
-			    GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-
-GLIB_AVAILABLE_IN_ALL
-GType         g_buffered_input_stream_get_type        (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GInputStream* g_buffered_input_stream_new             (GInputStream          *base_stream);
-GLIB_AVAILABLE_IN_ALL
-GInputStream* g_buffered_input_stream_new_sized       (GInputStream          *base_stream,
-						       gsize                  size);
-
-GLIB_AVAILABLE_IN_ALL
-gsize         g_buffered_input_stream_get_buffer_size (GBufferedInputStream  *stream);
-GLIB_AVAILABLE_IN_ALL
-void          g_buffered_input_stream_set_buffer_size (GBufferedInputStream  *stream,
-						       gsize                  size);
-GLIB_AVAILABLE_IN_ALL
-gsize         g_buffered_input_stream_get_available   (GBufferedInputStream  *stream);
-GLIB_AVAILABLE_IN_ALL
-gsize         g_buffered_input_stream_peek            (GBufferedInputStream  *stream,
-						       void                  *buffer,
-						       gsize                  offset,
-						       gsize                  count);
-GLIB_AVAILABLE_IN_ALL
-const void*   g_buffered_input_stream_peek_buffer     (GBufferedInputStream  *stream,
-						       gsize                 *count);
-
-GLIB_AVAILABLE_IN_ALL
-gssize        g_buffered_input_stream_fill            (GBufferedInputStream  *stream,
-						       gssize                 count,
-						       GCancellable          *cancellable,
-						       GError               **error);
-GLIB_AVAILABLE_IN_ALL
-void          g_buffered_input_stream_fill_async      (GBufferedInputStream  *stream,
-						       gssize                 count,
-						       int                    io_priority,
-						       GCancellable          *cancellable,
-						       GAsyncReadyCallback    callback,
-						       gpointer               user_data);
-GLIB_AVAILABLE_IN_ALL
-gssize        g_buffered_input_stream_fill_finish     (GBufferedInputStream  *stream,
-						       GAsyncResult          *result,
-						       GError               **error);
-
-GLIB_AVAILABLE_IN_ALL
-int           g_buffered_input_stream_read_byte       (GBufferedInputStream  *stream,
-						       GCancellable          *cancellable,
-						       GError               **error);
-
-G_END_DECLS
-
-#endif /* __G_BUFFERED_INPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gbufferedoutputstream.h b/linux-x86/include/glib-2.0/gio/gbufferedoutputstream.h
deleted file mode 100644
index 49c0fa9..0000000
--- a/linux-x86/include/glib-2.0/gio/gbufferedoutputstream.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#ifndef __G_BUFFERED_OUTPUT_STREAM_H__
-#define __G_BUFFERED_OUTPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gfilteroutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_BUFFERED_OUTPUT_STREAM         (g_buffered_output_stream_get_type ())
-#define G_BUFFERED_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_BUFFERED_OUTPUT_STREAM, GBufferedOutputStream))
-#define G_BUFFERED_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_BUFFERED_OUTPUT_STREAM, GBufferedOutputStreamClass))
-#define G_IS_BUFFERED_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_BUFFERED_OUTPUT_STREAM))
-#define G_IS_BUFFERED_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_BUFFERED_OUTPUT_STREAM))
-#define G_BUFFERED_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_BUFFERED_OUTPUT_STREAM, GBufferedOutputStreamClass))
-
-/**
- * GBufferedOutputStream:
- *
- * An implementation of #GFilterOutputStream with a sized buffer.
- **/
-typedef struct _GBufferedOutputStreamClass    GBufferedOutputStreamClass;
-typedef struct _GBufferedOutputStreamPrivate  GBufferedOutputStreamPrivate;
-
-struct _GBufferedOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< protected >*/
-  GBufferedOutputStreamPrivate *priv;
-};
-
-struct _GBufferedOutputStreamClass
-{
-  GFilterOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-};
-
-
-GLIB_AVAILABLE_IN_ALL
-GType          g_buffered_output_stream_get_type        (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GOutputStream* g_buffered_output_stream_new             (GOutputStream         *base_stream);
-GLIB_AVAILABLE_IN_ALL
-GOutputStream* g_buffered_output_stream_new_sized       (GOutputStream         *base_stream,
-							 gsize                  size);
-GLIB_AVAILABLE_IN_ALL
-gsize          g_buffered_output_stream_get_buffer_size (GBufferedOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
-void           g_buffered_output_stream_set_buffer_size (GBufferedOutputStream *stream,
-							 gsize                  size);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_buffered_output_stream_get_auto_grow   (GBufferedOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
-void           g_buffered_output_stream_set_auto_grow   (GBufferedOutputStream *stream,
-							 gboolean               auto_grow);
-
-G_END_DECLS
-
-#endif /* __G_BUFFERED_OUTPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gbytesicon.h b/linux-x86/include/glib-2.0/gio/gbytesicon.h
deleted file mode 100644
index bf7753b..0000000
--- a/linux-x86/include/glib-2.0/gio/gbytesicon.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_BYTES_ICON_H__
-#define __G_BYTES_ICON_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_BYTES_ICON         (g_bytes_icon_get_type ())
-#define G_BYTES_ICON(inst)        (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_BYTES_ICON, GBytesIcon))
-#define G_IS_BYTES_ICON(inst)     (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_BYTES_ICON))
-
-/**
- * GBytesIcon:
- *
- * Gets an icon for a #GBytes. Implements #GLoadableIcon.
- **/
-GLIB_AVAILABLE_IN_2_38
-GType   g_bytes_icon_get_type   (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_38
-GIcon * g_bytes_icon_new        (GBytes     *bytes);
-
-GLIB_AVAILABLE_IN_2_38
-GBytes * g_bytes_icon_get_bytes (GBytesIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_BYTES_ICON_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gcancellable.h b/linux-x86/include/glib-2.0/gio/gcancellable.h
deleted file mode 100644
index e44bbad..0000000
--- a/linux-x86/include/glib-2.0/gio/gcancellable.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_CANCELLABLE_H__
-#define __G_CANCELLABLE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CANCELLABLE         (g_cancellable_get_type ())
-#define G_CANCELLABLE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CANCELLABLE, GCancellable))
-#define G_CANCELLABLE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CANCELLABLE, GCancellableClass))
-#define G_IS_CANCELLABLE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CANCELLABLE))
-#define G_IS_CANCELLABLE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CANCELLABLE))
-#define G_CANCELLABLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CANCELLABLE, GCancellableClass))
-
-/**
- * GCancellable:
- *
- * Allows actions to be cancelled.
- */
-typedef struct _GCancellableClass   GCancellableClass;
-typedef struct _GCancellablePrivate GCancellablePrivate;
-
-struct _GCancellable
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GCancellablePrivate *priv;
-};
-
-struct _GCancellableClass
-{
-  GObjectClass parent_class;
-
-  void (* cancelled) (GCancellable *cancellable);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType         g_cancellable_get_type               (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GCancellable *g_cancellable_new                    (void);
-
-/* These are only safe to call inside a cancellable op */
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_cancellable_is_cancelled           (GCancellable  *cancellable);
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_cancellable_set_error_if_cancelled (GCancellable  *cancellable,
-						    GError       **error);
-
-GLIB_AVAILABLE_IN_ALL
-int           g_cancellable_get_fd                 (GCancellable  *cancellable);
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_cancellable_make_pollfd            (GCancellable  *cancellable,
-						    GPollFD       *pollfd);
-GLIB_AVAILABLE_IN_ALL
-void          g_cancellable_release_fd             (GCancellable  *cancellable);
-
-GLIB_AVAILABLE_IN_ALL
-GSource *     g_cancellable_source_new             (GCancellable  *cancellable);
-
-GLIB_AVAILABLE_IN_ALL
-GCancellable *g_cancellable_get_current            (void);
-GLIB_AVAILABLE_IN_ALL
-void          g_cancellable_push_current           (GCancellable  *cancellable);
-GLIB_AVAILABLE_IN_ALL
-void          g_cancellable_pop_current            (GCancellable  *cancellable);
-GLIB_AVAILABLE_IN_ALL
-void          g_cancellable_reset                  (GCancellable  *cancellable);
-GLIB_AVAILABLE_IN_ALL
-gulong        g_cancellable_connect                (GCancellable  *cancellable,
-						    GCallback      callback,
-						    gpointer       data,
-						    GDestroyNotify data_destroy_func);
-GLIB_AVAILABLE_IN_ALL
-void          g_cancellable_disconnect             (GCancellable  *cancellable,
-						    gulong         handler_id);
-
-
-/* This is safe to call from another thread */
-GLIB_AVAILABLE_IN_ALL
-void          g_cancellable_cancel       (GCancellable  *cancellable);
-
-G_END_DECLS
-
-#endif /* __G_CANCELLABLE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gcharsetconverter.h b/linux-x86/include/glib-2.0/gio/gcharsetconverter.h
deleted file mode 100644
index af9b989..0000000
--- a/linux-x86/include/glib-2.0/gio/gcharsetconverter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_CHARSET_CONVERTER_H__
-#define __G_CHARSET_CONVERTER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gconverter.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CHARSET_CONVERTER         (g_charset_converter_get_type ())
-#define G_CHARSET_CONVERTER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CHARSET_CONVERTER, GCharsetConverter))
-#define G_CHARSET_CONVERTER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CHARSET_CONVERTER, GCharsetConverterClass))
-#define G_IS_CHARSET_CONVERTER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CHARSET_CONVERTER))
-#define G_IS_CHARSET_CONVERTER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CHARSET_CONVERTER))
-#define G_CHARSET_CONVERTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CHARSET_CONVERTER, GCharsetConverterClass))
-
-typedef struct _GCharsetConverterClass   GCharsetConverterClass;
-
-struct _GCharsetConverterClass
-{
-  GObjectClass parent_class;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType              g_charset_converter_get_type      (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GCharsetConverter *g_charset_converter_new            (const gchar  *to_charset,
-						       const gchar  *from_charset,
-						       GError **error);
-GLIB_AVAILABLE_IN_ALL
-void               g_charset_converter_set_use_fallback (GCharsetConverter *converter,
-							 gboolean use_fallback);
-GLIB_AVAILABLE_IN_ALL
-gboolean           g_charset_converter_get_use_fallback (GCharsetConverter *converter);
-GLIB_AVAILABLE_IN_ALL
-guint              g_charset_converter_get_num_fallbacks (GCharsetConverter *converter);
-
-G_END_DECLS
-
-#endif /* __G_CHARSET_CONVERTER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gcontenttype.h b/linux-x86/include/glib-2.0/gio/gcontenttype.h
deleted file mode 100644
index 9ffbdeb..0000000
--- a/linux-x86/include/glib-2.0/gio/gcontenttype.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_CONTENT_TYPE_H__
-#define __G_CONTENT_TYPE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_content_type_equals            (const gchar  *type1,
-                                           const gchar  *type2);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_content_type_is_a              (const gchar  *type,
-                                           const gchar  *supertype);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_content_type_is_unknown        (const gchar  *type);
-GLIB_AVAILABLE_IN_ALL
-gchar *  g_content_type_get_description   (const gchar  *type);
-GLIB_AVAILABLE_IN_ALL
-gchar *  g_content_type_get_mime_type     (const gchar  *type);
-GLIB_AVAILABLE_IN_ALL
-GIcon *  g_content_type_get_icon          (const gchar  *type);
-GLIB_AVAILABLE_IN_2_34
-GIcon *  g_content_type_get_symbolic_icon (const gchar  *type);
-GLIB_AVAILABLE_IN_2_34
-gchar *  g_content_type_get_generic_icon_name (const gchar  *type);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_content_type_can_be_executable (const gchar  *type);
-
-GLIB_AVAILABLE_IN_ALL
-gchar *  g_content_type_from_mime_type    (const gchar  *mime_type);
-
-GLIB_AVAILABLE_IN_ALL
-gchar *  g_content_type_guess             (const gchar  *filename,
-                                           const guchar *data,
-                                           gsize         data_size,
-                                           gboolean     *result_uncertain);
-
-GLIB_AVAILABLE_IN_ALL
-gchar ** g_content_type_guess_for_tree    (GFile        *root);
-
-GLIB_AVAILABLE_IN_ALL
-GList *  g_content_types_get_registered   (void);
-
-G_END_DECLS
-
-#endif /* __G_CONTENT_TYPE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gconverter.h b/linux-x86/include/glib-2.0/gio/gconverter.h
deleted file mode 100644
index 4fea64d..0000000
--- a/linux-x86/include/glib-2.0/gio/gconverter.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_CONVERTER_H__
-#define __G_CONVERTER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CONVERTER            (g_converter_get_type ())
-#define G_CONVERTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_CONVERTER, GConverter))
-#define G_IS_CONVERTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_CONVERTER))
-#define G_CONVERTER_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_CONVERTER, GConverterIface))
-
-/**
- * GConverter:
- *
- * Seek object for streaming operations.
- *
- * Since: 2.24
- **/
-typedef struct _GConverterIface   GConverterIface;
-
-/**
- * GConverterIface:
- * @g_iface: The parent interface.
- * @convert: Converts data.
- * @reset: Reverts the internal state of the converter to its initial state.
- *
- * Provides an interface for converting data from one type
- * to another type. The conversion can be stateful
- * and may fail at any place.
- *
- * Since: 2.24
- **/
-struct _GConverterIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GConverterResult (* convert) (GConverter *converter,
-				const void *inbuf,
-				gsize       inbuf_size,
-				void       *outbuf,
-				gsize       outbuf_size,
-				GConverterFlags flags,
-				gsize      *bytes_read,
-				gsize      *bytes_written,
-				GError    **error);
-  void  (* reset)   (GConverter *converter);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType            g_converter_get_type     (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GConverterResult g_converter_convert (GConverter       *converter,
-				      const void       *inbuf,
-				      gsize             inbuf_size,
-				      void             *outbuf,
-				      gsize             outbuf_size,
-				      GConverterFlags   flags,
-				      gsize            *bytes_read,
-				      gsize            *bytes_written,
-				      GError          **error);
-GLIB_AVAILABLE_IN_ALL
-void             g_converter_reset   (GConverter       *converter);
-
-
-G_END_DECLS
-
-
-#endif /* __G_CONVERTER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gconverterinputstream.h b/linux-x86/include/glib-2.0/gio/gconverterinputstream.h
deleted file mode 100644
index 3a8f845..0000000
--- a/linux-x86/include/glib-2.0/gio/gconverterinputstream.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_CONVERTER_INPUT_STREAM_H__
-#define __G_CONVERTER_INPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gfilterinputstream.h>
-#include <gio/gconverter.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CONVERTER_INPUT_STREAM         (g_converter_input_stream_get_type ())
-#define G_CONVERTER_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CONVERTER_INPUT_STREAM, GConverterInputStream))
-#define G_CONVERTER_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CONVERTER_INPUT_STREAM, GConverterInputStreamClass))
-#define G_IS_CONVERTER_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CONVERTER_INPUT_STREAM))
-#define G_IS_CONVERTER_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CONVERTER_INPUT_STREAM))
-#define G_CONVERTER_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CONVERTER_INPUT_STREAM, GConverterInputStreamClass))
-
-/**
- * GConverterInputStream:
- *
- * An implementation of #GFilterInputStream that allows data
- * conversion.
- **/
-typedef struct _GConverterInputStreamClass    GConverterInputStreamClass;
-typedef struct _GConverterInputStreamPrivate  GConverterInputStreamPrivate;
-
-struct _GConverterInputStream
-{
-  GFilterInputStream parent_instance;
-
-  /*< private >*/
-  GConverterInputStreamPrivate *priv;
-};
-
-struct _GConverterInputStreamClass
-{
-  GFilterInputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                  g_converter_input_stream_get_type      (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GInputStream          *g_converter_input_stream_new           (GInputStream          *base_stream,
-                                                               GConverter            *converter);
-GLIB_AVAILABLE_IN_ALL
-GConverter            *g_converter_input_stream_get_converter (GConverterInputStream *converter_stream);
-
-G_END_DECLS
-
-#endif /* __G_CONVERTER_INPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gconverteroutputstream.h b/linux-x86/include/glib-2.0/gio/gconverteroutputstream.h
deleted file mode 100644
index 1f91001..0000000
--- a/linux-x86/include/glib-2.0/gio/gconverteroutputstream.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_CONVERTER_OUTPUT_STREAM_H__
-#define __G_CONVERTER_OUTPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gfilteroutputstream.h>
-#include <gio/gconverter.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CONVERTER_OUTPUT_STREAM         (g_converter_output_stream_get_type ())
-#define G_CONVERTER_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CONVERTER_OUTPUT_STREAM, GConverterOutputStream))
-#define G_CONVERTER_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CONVERTER_OUTPUT_STREAM, GConverterOutputStreamClass))
-#define G_IS_CONVERTER_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CONVERTER_OUTPUT_STREAM))
-#define G_IS_CONVERTER_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CONVERTER_OUTPUT_STREAM))
-#define G_CONVERTER_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CONVERTER_OUTPUT_STREAM, GConverterOutputStreamClass))
-
-/**
- * GConverterOutputStream:
- *
- * An implementation of #GFilterOutputStream that allows data
- * conversion.
- **/
-typedef struct _GConverterOutputStreamClass    GConverterOutputStreamClass;
-typedef struct _GConverterOutputStreamPrivate  GConverterOutputStreamPrivate;
-
-struct _GConverterOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< private >*/
-  GConverterOutputStreamPrivate *priv;
-};
-
-struct _GConverterOutputStreamClass
-{
-  GFilterOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_converter_output_stream_get_type      (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GOutputStream          *g_converter_output_stream_new           (GOutputStream         *base_stream,
-                                                                 GConverter            *converter);
-GLIB_AVAILABLE_IN_ALL
-GConverter             *g_converter_output_stream_get_converter (GConverterOutputStream *converter_stream);
-
-G_END_DECLS
-
-#endif /* __G_CONVERTER_OUTPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gcredentials.h b/linux-x86/include/glib-2.0/gio/gcredentials.h
deleted file mode 100644
index ff1ae4d..0000000
--- a/linux-x86/include/glib-2.0/gio/gcredentials.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_CREDENTIALS_H__
-#define __G_CREDENTIALS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-#ifdef G_OS_UNIX
-/* To get the uid_t type */
-#include <unistd.h>
-#include <sys/types.h>
-#endif
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CREDENTIALS         (g_credentials_get_type ())
-#define G_CREDENTIALS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CREDENTIALS, GCredentials))
-#define G_CREDENTIALS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CREDENTIALS, GCredentialsClass))
-#define G_CREDENTIALS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CREDENTIALS, GCredentialsClass))
-#define G_IS_CREDENTIALS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CREDENTIALS))
-#define G_IS_CREDENTIALS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CREDENTIALS))
-
-typedef struct _GCredentialsClass   GCredentialsClass;
-
-GLIB_AVAILABLE_IN_ALL
-GType            g_credentials_get_type           (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GCredentials    *g_credentials_new                (void);
-
-GLIB_AVAILABLE_IN_ALL
-gchar           *g_credentials_to_string          (GCredentials    *credentials);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer         g_credentials_get_native         (GCredentials    *credentials,
-                                                   GCredentialsType native_type);
-
-GLIB_AVAILABLE_IN_ALL
-void             g_credentials_set_native         (GCredentials    *credentials,
-                                                   GCredentialsType native_type,
-                                                   gpointer         native);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_credentials_is_same_user       (GCredentials    *credentials,
-                                                   GCredentials    *other_credentials,
-                                                   GError         **error);
-
-#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_2_36
-pid_t            g_credentials_get_unix_pid       (GCredentials    *credentials,
-                                                   GError         **error);
-GLIB_AVAILABLE_IN_ALL
-uid_t            g_credentials_get_unix_user      (GCredentials    *credentials,
-                                                   GError         **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_credentials_set_unix_user      (GCredentials    *credentials,
-                                                   uid_t           uid,
-                                                   GError         **error);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_DBUS_PROXY_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdatainputstream.h b/linux-x86/include/glib-2.0/gio/gdatainputstream.h
deleted file mode 100644
index 3ebf67a..0000000
--- a/linux-x86/include/glib-2.0/gio/gdatainputstream.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_DATA_INPUT_STREAM_H__
-#define __G_DATA_INPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gbufferedinputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DATA_INPUT_STREAM         (g_data_input_stream_get_type ())
-#define G_DATA_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DATA_INPUT_STREAM, GDataInputStream))
-#define G_DATA_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DATA_INPUT_STREAM, GDataInputStreamClass))
-#define G_IS_DATA_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DATA_INPUT_STREAM))
-#define G_IS_DATA_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DATA_INPUT_STREAM))
-#define G_DATA_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DATA_INPUT_STREAM, GDataInputStreamClass))
-
-/**
- * GDataInputStream:
- *
- * An implementation of #GBufferedInputStream that allows for high-level
- * data manipulation of arbitrary data (including binary operations).
- **/
-typedef struct _GDataInputStreamClass    GDataInputStreamClass;
-typedef struct _GDataInputStreamPrivate  GDataInputStreamPrivate;
-
-struct _GDataInputStream
-{
-  GBufferedInputStream parent_instance;
-
-  /*< private >*/
-  GDataInputStreamPrivate *priv;
-};
-
-struct _GDataInputStreamClass
-{
-  GBufferedInputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                  g_data_input_stream_get_type             (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GDataInputStream *     g_data_input_stream_new                  (GInputStream            *base_stream);
-
-GLIB_AVAILABLE_IN_ALL
-void                   g_data_input_stream_set_byte_order       (GDataInputStream        *stream,
-                                                                 GDataStreamByteOrder     order);
-GLIB_AVAILABLE_IN_ALL
-GDataStreamByteOrder   g_data_input_stream_get_byte_order       (GDataInputStream        *stream);
-GLIB_AVAILABLE_IN_ALL
-void                   g_data_input_stream_set_newline_type     (GDataInputStream        *stream,
-                                                                 GDataStreamNewlineType   type);
-GLIB_AVAILABLE_IN_ALL
-GDataStreamNewlineType g_data_input_stream_get_newline_type     (GDataInputStream        *stream);
-GLIB_AVAILABLE_IN_ALL
-guchar                 g_data_input_stream_read_byte            (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gint16                 g_data_input_stream_read_int16           (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-guint16                g_data_input_stream_read_uint16          (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gint32                 g_data_input_stream_read_int32           (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-guint32                g_data_input_stream_read_uint32          (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gint64                 g_data_input_stream_read_int64           (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-guint64                g_data_input_stream_read_uint64          (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-char *                 g_data_input_stream_read_line            (GDataInputStream        *stream,
-                                                                 gsize                   *length,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_2_30
-char *                 g_data_input_stream_read_line_utf8       (GDataInputStream        *stream,
-								 gsize                   *length,
-								 GCancellable            *cancellable,
-								 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-void                   g_data_input_stream_read_line_async      (GDataInputStream        *stream,
-                                                                 gint                     io_priority,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-GLIB_AVAILABLE_IN_ALL
-char *                 g_data_input_stream_read_line_finish     (GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_2_30
-char *                 g_data_input_stream_read_line_finish_utf8(GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-char *                 g_data_input_stream_read_until           (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gsize                   *length,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-void                   g_data_input_stream_read_until_async     (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gint                     io_priority,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-GLIB_AVAILABLE_IN_ALL
-char *                 g_data_input_stream_read_until_finish    (GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-char *                 g_data_input_stream_read_upto            (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gssize                   stop_chars_len,
-                                                                 gsize                   *length,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-void                   g_data_input_stream_read_upto_async      (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gssize                   stop_chars_len,
-                                                                 gint                     io_priority,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-GLIB_AVAILABLE_IN_ALL
-char *                 g_data_input_stream_read_upto_finish     (GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_DATA_INPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdataoutputstream.h b/linux-x86/include/glib-2.0/gio/gdataoutputstream.h
deleted file mode 100644
index 12db684..0000000
--- a/linux-x86/include/glib-2.0/gio/gdataoutputstream.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_DATA_OUTPUT_STREAM_H__
-#define __G_DATA_OUTPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gfilteroutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DATA_OUTPUT_STREAM         (g_data_output_stream_get_type ())
-#define G_DATA_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DATA_OUTPUT_STREAM, GDataOutputStream))
-#define G_DATA_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DATA_OUTPUT_STREAM, GDataOutputStreamClass))
-#define G_IS_DATA_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DATA_OUTPUT_STREAM))
-#define G_IS_DATA_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DATA_OUTPUT_STREAM))
-#define G_DATA_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DATA_OUTPUT_STREAM, GDataOutputStreamClass))
-
-/**
- * GDataOutputStream:
- *
- * An implementation of #GBufferedOutputStream that allows for high-level
- * data manipulation of arbitrary data (including binary operations).
- **/
-typedef struct _GDataOutputStream         GDataOutputStream;
-typedef struct _GDataOutputStreamClass    GDataOutputStreamClass;
-typedef struct _GDataOutputStreamPrivate  GDataOutputStreamPrivate;
-
-struct _GDataOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< private >*/
-  GDataOutputStreamPrivate *priv;
-};
-
-struct _GDataOutputStreamClass
-{
-  GFilterOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-
-GLIB_AVAILABLE_IN_ALL
-GType                g_data_output_stream_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GDataOutputStream *  g_data_output_stream_new            (GOutputStream         *base_stream);
-
-GLIB_AVAILABLE_IN_ALL
-void                 g_data_output_stream_set_byte_order (GDataOutputStream     *stream,
-							  GDataStreamByteOrder   order);
-GLIB_AVAILABLE_IN_ALL
-GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream     *stream);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean             g_data_output_stream_put_byte       (GDataOutputStream     *stream,
-							  guchar                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean             g_data_output_stream_put_int16      (GDataOutputStream     *stream,
-							  gint16                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean             g_data_output_stream_put_uint16     (GDataOutputStream     *stream,
-							  guint16                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean             g_data_output_stream_put_int32      (GDataOutputStream     *stream,
-							  gint32                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean             g_data_output_stream_put_uint32     (GDataOutputStream     *stream,
-							  guint32                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean             g_data_output_stream_put_int64      (GDataOutputStream     *stream,
-							  gint64                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean             g_data_output_stream_put_uint64     (GDataOutputStream     *stream,
-							  guint64                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean             g_data_output_stream_put_string     (GDataOutputStream     *stream,
-							  const char            *str,
-							  GCancellable          *cancellable,
-							  GError               **error);
-
-G_END_DECLS
-
-#endif /* __G_DATA_OUTPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusactiongroup.h b/linux-x86/include/glib-2.0/gio/gdbusactiongroup.h
deleted file mode 100644
index 4d8e168..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusactiongroup.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- * Copyright © 2011 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_DBUS_ACTION_GROUP_H__
-#define __G_DBUS_ACTION_GROUP_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include "giotypes.h"
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_ACTION_GROUP                            (g_dbus_action_group_get_type ())
-#define G_DBUS_ACTION_GROUP(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroup))
-#define G_DBUS_ACTION_GROUP_CLASS(class)                    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
-#define G_IS_DBUS_ACTION_GROUP(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_DBUS_ACTION_GROUP))
-#define G_IS_DBUS_ACTION_GROUP_CLASS(class)                 (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_DBUS_ACTION_GROUP))
-#define G_DBUS_ACTION_GROUP_GET_CLASS(inst)                 (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_dbus_action_group_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GDBusActionGroup *      g_dbus_action_group_get                       (GDBusConnection        *connection,
-                                                                       const gchar            *bus_name,
-                                                                       const gchar            *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_ACTION_GROUP_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusaddress.h b/linux-x86/include/glib-2.0/gio/gdbusaddress.h
deleted file mode 100644
index 08773aa..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusaddress.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_ADDRESS_H__
-#define __G_DBUS_ADDRESS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_2_36
-gchar *g_dbus_address_escape_value (const gchar *string);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_is_address (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_is_supported_address (const gchar  *string,
-                                      GError      **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_address_get_stream        (const gchar          *address,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-
-GLIB_AVAILABLE_IN_ALL
-GIOStream           *g_dbus_address_get_stream_finish (GAsyncResult         *res,
-                                                       gchar               **out_guid,
-                                                       GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-GIOStream           *g_dbus_address_get_stream_sync   (const gchar          *address,
-                                                       gchar               **out_guid,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-gchar               *g_dbus_address_get_for_bus_sync  (GBusType              bus_type,
-                                                       GCancellable  *cancellable,
-                                                       GError              **error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_ADDRESS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusauthobserver.h b/linux-x86/include/glib-2.0/gio/gdbusauthobserver.h
deleted file mode 100644
index bc61c53..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusauthobserver.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_AUTH_OBSERVER_H__
-#define __G_DBUS_AUTH_OBSERVER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_AUTH_OBSERVER         (g_dbus_auth_observer_get_type ())
-#define G_DBUS_AUTH_OBSERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_AUTH_OBSERVER, GDBusAuthObserver))
-#define G_IS_DBUS_AUTH_OBSERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_AUTH_OBSERVER))
-
-GLIB_AVAILABLE_IN_ALL
-GType              g_dbus_auth_observer_get_type                     (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GDBusAuthObserver *g_dbus_auth_observer_new                          (void);
-GLIB_AVAILABLE_IN_ALL
-gboolean           g_dbus_auth_observer_authorize_authenticated_peer (GDBusAuthObserver  *observer,
-                                                                      GIOStream          *stream,
-                                                                      GCredentials       *credentials);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean           g_dbus_auth_observer_allow_mechanism (GDBusAuthObserver  *observer,
-                                                         const gchar        *mechanism);
-
-G_END_DECLS
-
-#endif /* _G_DBUS_AUTH_OBSERVER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusconnection.h b/linux-x86/include/glib-2.0/gio/gdbusconnection.h
deleted file mode 100644
index a669953..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusconnection.h
+++ /dev/null
@@ -1,669 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_CONNECTION_H__
-#define __G_DBUS_CONNECTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_CONNECTION         (g_dbus_connection_get_type ())
-#define G_DBUS_CONNECTION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_CONNECTION, GDBusConnection))
-#define G_IS_DBUS_CONNECTION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_CONNECTION))
-
-GLIB_AVAILABLE_IN_ALL
-GType            g_dbus_connection_get_type                   (void) G_GNUC_CONST;
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-GLIB_AVAILABLE_IN_ALL
-void              g_bus_get                    (GBusType             bus_type,
-                                                GCancellable        *cancellable,
-                                                GAsyncReadyCallback  callback,
-                                                gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection  *g_bus_get_finish             (GAsyncResult        *res,
-                                                GError             **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection  *g_bus_get_sync               (GBusType            bus_type,
-                                                GCancellable       *cancellable,
-                                                GError            **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_connection_new                        (GIOStream              *stream,
-                                                               const gchar            *guid,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GAsyncReadyCallback     callback,
-                                                               gpointer                user_data);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection *g_dbus_connection_new_finish                 (GAsyncResult           *res,
-                                                               GError                **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection *g_dbus_connection_new_sync                   (GIOStream              *stream,
-                                                               const gchar            *guid,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GError                **error);
-
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_connection_new_for_address            (const gchar            *address,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GAsyncReadyCallback     callback,
-                                                               gpointer                user_data);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection *g_dbus_connection_new_for_address_finish     (GAsyncResult           *res,
-                                                               GError                **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection *g_dbus_connection_new_for_address_sync       (const gchar            *address,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GError                **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_connection_start_message_processing   (GDBusConnection    *connection);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_dbus_connection_is_closed                  (GDBusConnection    *connection);
-GLIB_AVAILABLE_IN_ALL
-GIOStream       *g_dbus_connection_get_stream                 (GDBusConnection    *connection);
-GLIB_AVAILABLE_IN_ALL
-const gchar     *g_dbus_connection_get_guid                   (GDBusConnection    *connection);
-GLIB_AVAILABLE_IN_ALL
-const gchar     *g_dbus_connection_get_unique_name            (GDBusConnection    *connection);
-GLIB_AVAILABLE_IN_ALL
-GCredentials    *g_dbus_connection_get_peer_credentials       (GDBusConnection    *connection);
-
-GLIB_AVAILABLE_IN_2_34
-guint32          g_dbus_connection_get_last_serial            (GDBusConnection    *connection);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_dbus_connection_get_exit_on_close          (GDBusConnection    *connection);
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_connection_set_exit_on_close          (GDBusConnection    *connection,
-                                                               gboolean            exit_on_close);
-GLIB_AVAILABLE_IN_ALL
-GDBusCapabilityFlags  g_dbus_connection_get_capabilities      (GDBusConnection    *connection);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_connection_close                          (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GAsyncReadyCallback  callback,
-                                                                   gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_dbus_connection_close_finish                   (GDBusConnection     *connection,
-                                                                   GAsyncResult        *res,
-                                                                   GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_dbus_connection_close_sync                     (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GError             **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_connection_flush                          (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GAsyncReadyCallback  callback,
-                                                                   gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_dbus_connection_flush_finish                   (GDBusConnection     *connection,
-                                                                   GAsyncResult        *res,
-                                                                   GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_dbus_connection_flush_sync                     (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GError             **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_dbus_connection_send_message                   (GDBusConnection     *connection,
-                                                                   GDBusMessage        *message,
-                                                                   GDBusSendMessageFlags flags,
-                                                                   volatile guint32    *out_serial,
-                                                                   GError             **error);
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_connection_send_message_with_reply        (GDBusConnection     *connection,
-                                                                   GDBusMessage        *message,
-                                                                   GDBusSendMessageFlags flags,
-                                                                   gint                 timeout_msec,
-                                                                   volatile guint32    *out_serial,
-                                                                   GCancellable        *cancellable,
-                                                                   GAsyncReadyCallback  callback,
-                                                                   gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage    *g_dbus_connection_send_message_with_reply_finish (GDBusConnection     *connection,
-                                                                   GAsyncResult        *res,
-                                                                   GError             **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage    *g_dbus_connection_send_message_with_reply_sync   (GDBusConnection     *connection,
-                                                                   GDBusMessage        *message,
-                                                                   GDBusSendMessageFlags flags,
-                                                                   gint                 timeout_msec,
-                                                                   volatile guint32    *out_serial,
-                                                                   GCancellable        *cancellable,
-                                                                   GError             **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_dbus_connection_emit_signal                       (GDBusConnection    *connection,
-                                                               const gchar        *destination_bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *signal_name,
-                                                               GVariant           *parameters,
-                                                               GError            **error);
-GLIB_AVAILABLE_IN_ALL
-void      g_dbus_connection_call                              (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GCancellable       *cancellable,
-                                                               GAsyncReadyCallback callback,
-                                                               gpointer            user_data);
-GLIB_AVAILABLE_IN_ALL
-GVariant *g_dbus_connection_call_finish                       (GDBusConnection    *connection,
-                                                               GAsyncResult       *res,
-                                                               GError            **error);
-GLIB_AVAILABLE_IN_ALL
-GVariant *g_dbus_connection_call_sync                         (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GCancellable       *cancellable,
-                                                               GError            **error);
-GLIB_AVAILABLE_IN_2_30
-void      g_dbus_connection_call_with_unix_fd_list            (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GUnixFDList        *fd_list,
-                                                               GCancellable       *cancellable,
-                                                               GAsyncReadyCallback callback,
-                                                               gpointer            user_data);
-GLIB_AVAILABLE_IN_2_30
-GVariant *g_dbus_connection_call_with_unix_fd_list_finish     (GDBusConnection    *connection,
-                                                               GUnixFDList       **out_fd_list,
-                                                               GAsyncResult       *res,
-                                                               GError            **error);
-GLIB_AVAILABLE_IN_2_30
-GVariant *g_dbus_connection_call_with_unix_fd_list_sync       (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GUnixFDList        *fd_list,
-                                                               GUnixFDList       **out_fd_list,
-                                                               GCancellable       *cancellable,
-                                                               GError            **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-
-/**
- * GDBusInterfaceMethodCallFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that the method was invoked on.
- * @interface_name: The D-Bus interface name the method was invoked on.
- * @method_name: The name of the method that was invoked.
- * @parameters: A #GVariant tuple with parameters.
- * @invocation: A #GDBusMethodInvocation object that can be used to return a value or error.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_object().
- *
- * The type of the @method_call function in #GDBusInterfaceVTable.
- *
- * Since: 2.26
- */
-typedef void (*GDBusInterfaceMethodCallFunc) (GDBusConnection       *connection,
-                                              const gchar           *sender,
-                                              const gchar           *object_path,
-                                              const gchar           *interface_name,
-                                              const gchar           *method_name,
-                                              GVariant              *parameters,
-                                              GDBusMethodInvocation *invocation,
-                                              gpointer               user_data);
-
-/**
- * GDBusInterfaceGetPropertyFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that the method was invoked on.
- * @interface_name: The D-Bus interface name for the property.
- * @property_name: The name of the property to get the value of.
- * @error: Return location for error.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_object().
- *
- * The type of the @get_property function in #GDBusInterfaceVTable.
- *
- * Returns: A #GVariant with the value for @property_name or %NULL if
- *     @error is set. If the returned #GVariant is floating, it is
- *     consumed - otherwise its reference count is decreased by one.
- *
- * Since: 2.26
- */
-typedef GVariant *(*GDBusInterfaceGetPropertyFunc) (GDBusConnection       *connection,
-                                                    const gchar           *sender,
-                                                    const gchar           *object_path,
-                                                    const gchar           *interface_name,
-                                                    const gchar           *property_name,
-                                                    GError               **error,
-                                                    gpointer               user_data);
-
-/**
- * GDBusInterfaceSetPropertyFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that the method was invoked on.
- * @interface_name: The D-Bus interface name for the property.
- * @property_name: The name of the property to get the value of.
- * @value: The value to set the property to.
- * @error: Return location for error.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_object().
- *
- * The type of the @set_property function in #GDBusInterfaceVTable.
- *
- * Returns: %TRUE if the property was set to @value, %FALSE if @error is set.
- *
- * Since: 2.26
- */
-typedef gboolean  (*GDBusInterfaceSetPropertyFunc) (GDBusConnection       *connection,
-                                                    const gchar           *sender,
-                                                    const gchar           *object_path,
-                                                    const gchar           *interface_name,
-                                                    const gchar           *property_name,
-                                                    GVariant              *value,
-                                                    GError               **error,
-                                                    gpointer               user_data);
-
-/**
- * GDBusInterfaceVTable:
- * @method_call: Function for handling incoming method calls.
- * @get_property: Function for getting a property.
- * @set_property: Function for setting a property.
- *
- * Virtual table for handling properties and method calls for a D-Bus
- * interface.
- *
- * Since 2.38, if you want to handle getting/setting D-Bus properties
- * asynchronously, give %NULL as your get_property() or set_property()
- * function.  The D-Bus call will be directed to your @method_call
- * function, with the provided @interface_name set to
- * <literal>"org.freedesktop.DBus.Properties"</literal>.
- *
- * The usual checks on the validity of the calls is performed.  For
- * <literal>'Get'</literal> calls, an error is automatically returned if
- * the property does not exist or the permissions do not allow access.
- * The same checks are performed for <literal>'Set'</literal> calls, and
- * the provided value is also checked for being the correct type.
- *
- * For both <literal>'Get'</literal> and <literal>'Set'</literal> calls,
- * the #GDBusMethodInvocation passed to the method_call handler can be
- * queried with g_dbus_method_invocation_get_property_info() to get a
- * pointer to the #GDBusPropertyInfo of the property.
- *
- * If you have readable properties specified in your interface info, you
- * must ensure that you either provide a non-%NULL @get_property()
- * function or provide implementations of both the
- * <literal>'Get'</literal> and <literal>'GetAll'</literal> methods on
- * the <literal>'org.freedesktop.DBus.Properties'</literal> interface in
- * your @method_call function.  Note that the required return type of
- * the <literal>'Get'</literal> call is <literal>(v)</literal>, not the
- * type of the property.  <literal>'GetAll'</literal> expects a return
- * value of type <literal>a{sv}</literal>.
- *
- * If you have writable properties specified in your interface info, you
- * must ensure that you either provide a non-%NULL @set_property()
- * function or provide an implementation of the <literal>'Set'</literal>
- * call.  If implementing the call, you must return the value of type
- * %G_VARIANT_TYPE_UNIT.
- *
- * Since: 2.26
- */
-struct _GDBusInterfaceVTable
-{
-  GDBusInterfaceMethodCallFunc  method_call;
-  GDBusInterfaceGetPropertyFunc get_property;
-  GDBusInterfaceSetPropertyFunc set_property;
-
-  /*< private >*/
-  /* Padding for future expansion - also remember to update
-   * gdbusconnection.c:_g_dbus_interface_vtable_copy() when
-   * changing this.
-   */
-  gpointer padding[8];
-};
-
-GLIB_AVAILABLE_IN_ALL
-guint            g_dbus_connection_register_object            (GDBusConnection            *connection,
-                                                               const gchar                *object_path,
-                                                               GDBusInterfaceInfo         *interface_info,
-                                                               const GDBusInterfaceVTable *vtable,
-                                                               gpointer                    user_data,
-                                                               GDestroyNotify              user_data_free_func,
-                                                               GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_dbus_connection_unregister_object          (GDBusConnection            *connection,
-                                                               guint                       registration_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-/**
- * GDBusSubtreeEnumerateFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that was registered with g_dbus_connection_register_subtree().
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_subtree().
- *
- * The type of the @enumerate function in #GDBusSubtreeVTable.
- *
- * This function is called when generating introspection data and also
- * when preparing to dispatch incoming messages in the event that the
- * %G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES flag is not
- * specified (ie: to verify that the object path is valid).
- *
- * Hierarchies are not supported; the items that you return should not
- * contain the '/' character.
- *
- * The return value will be freed with g_strfreev().
- *
- * Returns: A newly allocated array of strings for node names that are children of @object_path.
- *
- * Since: 2.26
- */
-typedef gchar** (*GDBusSubtreeEnumerateFunc) (GDBusConnection       *connection,
-                                              const gchar           *sender,
-                                              const gchar           *object_path,
-                                              gpointer               user_data);
-
-/**
- * GDBusSubtreeIntrospectFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that was registered with g_dbus_connection_register_subtree().
- * @node: A node that is a child of @object_path (relative to @object_path) or %NULL for the root of the subtree.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_subtree().
- *
- * The type of the @introspect function in #GDBusSubtreeVTable.
- *
- * Subtrees are flat.  @node, if non-%NULL, is always exactly one
- * segment of the object path (ie: it never contains a slash).
- *
- * This function should return %NULL to indicate that there is no object
- * at this node.
- *
- * If this function returns non-%NULL, the return value is expected to
- * be a %NULL-terminated array of pointers to #GDBusInterfaceInfo
- * structures describing the interfaces implemented by @node.  This
- * array will have g_dbus_interface_info_unref() called on each item
- * before being freed with g_free().
- *
- * The difference between returning %NULL and an array containing zero
- * items is that the standard DBus interfaces will returned to the
- * remote introspector in the empty array case, but not in the %NULL
- * case.
- *
- * Returns: A %NULL-terminated array of pointers to #GDBusInterfaceInfo, or %NULL.
- *
- * Since: 2.26
- */
-typedef GDBusInterfaceInfo ** (*GDBusSubtreeIntrospectFunc) (GDBusConnection       *connection,
-                                                             const gchar           *sender,
-                                                             const gchar           *object_path,
-                                                             const gchar           *node,
-                                                             gpointer               user_data);
-
-/**
- * GDBusSubtreeDispatchFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that was registered with g_dbus_connection_register_subtree().
- * @interface_name: The D-Bus interface name that the method call or property access is for.
- * @node: A node that is a child of @object_path (relative to @object_path) or %NULL for the root of the subtree.
- * @out_user_data: Return location for user data to pass to functions in the returned #GDBusInterfaceVTable (never %NULL).
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_subtree().
- *
- * The type of the @dispatch function in #GDBusSubtreeVTable.
- *
- * Subtrees are flat.  @node, if non-%NULL, is always exactly one
- * segment of the object path (ie: it never contains a slash).
- *
- * Returns: A #GDBusInterfaceVTable or %NULL if you don't want to handle the methods.
- *
- * Since: 2.26
- */
-typedef const GDBusInterfaceVTable * (*GDBusSubtreeDispatchFunc) (GDBusConnection             *connection,
-                                                                  const gchar                 *sender,
-                                                                  const gchar                 *object_path,
-                                                                  const gchar                 *interface_name,
-                                                                  const gchar                 *node,
-                                                                  gpointer                    *out_user_data,
-                                                                  gpointer                     user_data);
-
-/**
- * GDBusSubtreeVTable:
- * @enumerate: Function for enumerating child nodes.
- * @introspect: Function for introspecting a child node.
- * @dispatch: Function for dispatching a remote call on a child node.
- *
- * Virtual table for handling subtrees registered with g_dbus_connection_register_subtree().
- *
- * Since: 2.26
- */
-struct _GDBusSubtreeVTable
-{
-  GDBusSubtreeEnumerateFunc  enumerate;
-  GDBusSubtreeIntrospectFunc introspect;
-  GDBusSubtreeDispatchFunc   dispatch;
-
-  /*< private >*/
-  /* Padding for future expansion - also remember to update
-   * gdbusconnection.c:_g_dbus_subtree_vtable_copy() when
-   * changing this.
-   */
-  gpointer padding[8];
-};
-
-GLIB_AVAILABLE_IN_ALL
-guint            g_dbus_connection_register_subtree           (GDBusConnection            *connection,
-                                                               const gchar                *object_path,
-                                                               const GDBusSubtreeVTable   *vtable,
-                                                               GDBusSubtreeFlags           flags,
-                                                               gpointer                    user_data,
-                                                               GDestroyNotify              user_data_free_func,
-                                                               GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_dbus_connection_unregister_subtree         (GDBusConnection            *connection,
-                                                               guint                       registration_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-/**
- * GDBusSignalCallback:
- * @connection: A #GDBusConnection.
- * @sender_name: The unique bus name of the sender of the signal.
- * @object_path: The object path that the signal was emitted on.
- * @interface_name: The name of the interface.
- * @signal_name: The name of the signal.
- * @parameters: A #GVariant tuple with parameters for the signal.
- * @user_data: User data passed when subscribing to the signal.
- *
- * Signature for callback function used in g_dbus_connection_signal_subscribe().
- *
- * Since: 2.26
- */
-typedef void (*GDBusSignalCallback) (GDBusConnection  *connection,
-                                     const gchar      *sender_name,
-                                     const gchar      *object_path,
-                                     const gchar      *interface_name,
-                                     const gchar      *signal_name,
-                                     GVariant         *parameters,
-                                     gpointer          user_data);
-
-GLIB_AVAILABLE_IN_ALL
-guint            g_dbus_connection_signal_subscribe           (GDBusConnection     *connection,
-                                                               const gchar         *sender,
-                                                               const gchar         *interface_name,
-                                                               const gchar         *member,
-                                                               const gchar         *object_path,
-                                                               const gchar         *arg0,
-                                                               GDBusSignalFlags     flags,
-                                                               GDBusSignalCallback  callback,
-                                                               gpointer             user_data,
-                                                               GDestroyNotify       user_data_free_func);
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_connection_signal_unsubscribe         (GDBusConnection     *connection,
-                                                               guint                subscription_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-/**
- * GDBusMessageFilterFunction:
- * @connection: (transfer none): A #GDBusConnection.
- * @message: (transfer full): A locked #GDBusMessage that the filter function takes ownership of.
- * @incoming: %TRUE if it is a message received from the other peer, %FALSE if it is
- * a message to be sent to the other peer.
- * @user_data: User data passed when adding the filter.
- *
- * Signature for function used in g_dbus_connection_add_filter().
- *
- * A filter function is passed a #GDBusMessage and expected to return
- * a #GDBusMessage too. Passive filter functions that don't modify the
- * message can simply return the @message object:
- * |[
- * static GDBusMessage *
- * passive_filter (GDBusConnection *connection
- *                 GDBusMessage    *message,
- *                 gboolean         incoming,
- *                 gpointer         user_data)
- * {
- *   /<!-- -->* inspect @message *<!-- -->/
- *   return message;
- * }
- * ]|
- * Filter functions that wants to drop a message can simply return %NULL:
- * |[
- * static GDBusMessage *
- * drop_filter (GDBusConnection *connection
- *              GDBusMessage    *message,
- *              gboolean         incoming,
- *              gpointer         user_data)
- * {
- *   if (should_drop_message)
- *     {
- *       g_object_unref (message);
- *       message = NULL;
- *     }
- *   return message;
- * }
- * ]|
- * Finally, a filter function may modify a message by copying it:
- * |[
- * static GDBusMessage *
- * modifying_filter (GDBusConnection *connection
- *                   GDBusMessage    *message,
- *                   gboolean         incoming,
- *                   gpointer         user_data)
- * {
- *   GDBusMessage *copy;
- *   GError *error;
- *
- *   error = NULL;
- *   copy = g_dbus_message_copy (message, &error);
- *   /<!-- -->* handle @error being is set *<!-- -->/
- *   g_object_unref (message);
- *
- *   /<!-- -->* modify @copy *<!-- -->/
- *
- *   return copy;
- * }
- * ]|
- * If the returned #GDBusMessage is different from @message and cannot
- * be sent on @connection (it could use features, such as file
- * descriptors, not compatible with @connection), then a warning is
- * logged to <emphasis>standard error</emphasis>. Applications can
- * check this ahead of time using g_dbus_message_to_blob() passing a
- * #GDBusCapabilityFlags value obtained from @connection.
- *
- * Returns: (transfer full) (allow-none): A #GDBusMessage that will be freed with
- * g_object_unref() or %NULL to drop the message. Passive filter
- * functions can simply return the passed @message object.
- *
- * Since: 2.26
- */
-typedef GDBusMessage *(*GDBusMessageFilterFunction) (GDBusConnection *connection,
-                                                     GDBusMessage    *message,
-                                                     gboolean         incoming,
-                                                     gpointer         user_data);
-
-GLIB_AVAILABLE_IN_ALL
-guint g_dbus_connection_add_filter (GDBusConnection            *connection,
-                                    GDBusMessageFilterFunction  filter_function,
-                                    gpointer                    user_data,
-                                    GDestroyNotify              user_data_free_func);
-
-GLIB_AVAILABLE_IN_ALL
-void  g_dbus_connection_remove_filter (GDBusConnection    *connection,
-                                       guint               filter_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-
-G_END_DECLS
-
-#endif /* __G_DBUS_CONNECTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbuserror.h b/linux-x86/include/glib-2.0/gio/gdbuserror.h
deleted file mode 100644
index cc90a9e..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbuserror.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_ERROR_H__
-#define __G_DBUS_ERROR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_DBUS_ERROR:
- *
- * Error domain for errors generated by a remote message bus. Errors
- * in this domain will be from the #GDBusError enumeration.  See
- * #GError for more information on error domains.
- *
- * Note that errors in this error domain is intended only for
- * returning errors from a remote message bus process. Errors
- * generated locally in-process by e.g. #GDBusConnection is from the
- * %G_IO_ERROR domain.
- *
- * Since: 2.26
- */
-#define G_DBUS_ERROR g_dbus_error_quark()
-
-GLIB_AVAILABLE_IN_ALL
-GQuark g_dbus_error_quark (void);
-
-/* Used by applications to check, get and strip the D-Bus error name */
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_error_is_remote_error       (const GError    *error);
-GLIB_AVAILABLE_IN_ALL
-gchar   *g_dbus_error_get_remote_error      (const GError    *error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_error_strip_remote_error    (GError          *error);
-
-/**
- * GDBusErrorEntry:
- * @error_code: An error code.
- * @dbus_error_name: The D-Bus error name to associate with @error_code.
- *
- * Struct used in g_dbus_error_register_error_domain().
- *
- * Since: 2.26
- */
-struct _GDBusErrorEntry
-{
-  gint         error_code;
-  const gchar *dbus_error_name;
-};
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_error_register_error        (GQuark                 error_domain,
-                                             gint                   error_code,
-                                             const gchar           *dbus_error_name);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_error_unregister_error      (GQuark                 error_domain,
-                                             gint                   error_code,
-                                             const gchar           *dbus_error_name);
-GLIB_AVAILABLE_IN_ALL
-void     g_dbus_error_register_error_domain (const gchar           *error_domain_quark_name,
-                                             volatile gsize        *quark_volatile,
-                                             const GDBusErrorEntry *entries,
-                                             guint                  num_entries);
-
-/* Only used by object mappings to map back and forth to GError */
-GLIB_AVAILABLE_IN_ALL
-GError  *g_dbus_error_new_for_dbus_error    (const gchar     *dbus_error_name,
-                                             const gchar     *dbus_error_message);
-GLIB_AVAILABLE_IN_ALL
-void     g_dbus_error_set_dbus_error        (GError         **error,
-                                             const gchar     *dbus_error_name,
-                                             const gchar     *dbus_error_message,
-                                             const gchar     *format,
-                                             ...) G_GNUC_PRINTF(4, 5);
-GLIB_AVAILABLE_IN_ALL
-void     g_dbus_error_set_dbus_error_valist (GError         **error,
-                                             const gchar     *dbus_error_name,
-                                             const gchar     *dbus_error_message,
-                                             const gchar     *format,
-                                             va_list          var_args) G_GNUC_PRINTF(4, 0);
-GLIB_AVAILABLE_IN_ALL
-gchar   *g_dbus_error_encode_gerror         (const GError    *error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_ERROR_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusinterface.h b/linux-x86/include/glib-2.0/gio/gdbusinterface.h
deleted file mode 100644
index a82a757..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusinterface.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_INTERFACE_H__
-#define __G_DBUS_INTERFACE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_INTERFACE         (g_dbus_interface_get_type())
-#define G_DBUS_INTERFACE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_INTERFACE, GDBusInterface))
-#define G_IS_DBUS_INTERFACE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_INTERFACE))
-#define G_DBUS_INTERFACE_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), G_TYPE_DBUS_INTERFACE, GDBusInterfaceIface))
-
-/**
- * GDBusInterface:
- *
- * Base type for D-Bus interfaces.
- *
- * Since: 2.30
- */
-
-typedef struct _GDBusInterfaceIface GDBusInterfaceIface;
-
-/**
- * GDBusInterfaceIface:
- * @parent_iface: The parent interface.
- * @get_info: Returns a #GDBusInterfaceInfo. See g_dbus_interface_get_info().
- * @get_object: Gets the enclosing #GDBusObject. See g_dbus_interface_get_object().
- * @set_object: Sets the enclosing #GDBusObject. See g_dbus_interface_set_object().
- * @dup_object: Gets a reference to the enclosing #GDBusObject. See g_dbus_interface_dup_object(). Added in 2.32.
- *
- * Base type for D-Bus interfaces.
- *
- * Since: 2.30
- */
-struct _GDBusInterfaceIface
-{
-  GTypeInterface parent_iface;
-
-  /* Virtual Functions */
-  GDBusInterfaceInfo   *(*get_info)   (GDBusInterface      *interface_);
-  GDBusObject          *(*get_object) (GDBusInterface      *interface_);
-  void                  (*set_object) (GDBusInterface      *interface_,
-                                       GDBusObject         *object);
-  GDBusObject          *(*dup_object) (GDBusInterface      *interface_);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                 g_dbus_interface_get_type         (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GDBusInterfaceInfo   *g_dbus_interface_get_info         (GDBusInterface      *interface_);
-GLIB_AVAILABLE_IN_ALL
-GDBusObject          *g_dbus_interface_get_object       (GDBusInterface      *interface_);
-GLIB_AVAILABLE_IN_ALL
-void                  g_dbus_interface_set_object       (GDBusInterface      *interface_,
-                                                         GDBusObject         *object);
-GLIB_AVAILABLE_IN_2_32
-GDBusObject          *g_dbus_interface_dup_object       (GDBusInterface      *interface_);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_INTERFACE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusinterfaceskeleton.h b/linux-x86/include/glib-2.0/gio/gdbusinterfaceskeleton.h
deleted file mode 100644
index ca79c53..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusinterfaceskeleton.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_INTERFACE_SKELETON_H__
-#define __G_DBUS_INTERFACE_SKELETON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_INTERFACE_SKELETON         (g_dbus_interface_skeleton_get_type ())
-#define G_DBUS_INTERFACE_SKELETON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_INTERFACE_SKELETON, GDBusInterfaceSkeleton))
-#define G_DBUS_INTERFACE_SKELETON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_INTERFACE_SKELETON, GDBusInterfaceSkeletonClass))
-#define G_DBUS_INTERFACE_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_INTERFACE_SKELETON, GDBusInterfaceSkeletonClass))
-#define G_IS_DBUS_INTERFACE_SKELETON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_INTERFACE_SKELETON))
-#define G_IS_DBUS_INTERFACE_SKELETON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_INTERFACE_SKELETON))
-
-typedef struct _GDBusInterfaceSkeletonClass   GDBusInterfaceSkeletonClass;
-typedef struct _GDBusInterfaceSkeletonPrivate GDBusInterfaceSkeletonPrivate;
-
-/**
- * GDBusInterfaceSkeleton:
- *
- * The #GDBusInterfaceSkeleton structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusInterfaceSkeleton
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusInterfaceSkeletonPrivate *priv;
-};
-
-/**
- * GDBusInterfaceSkeletonClass:
- * @parent_class: The parent class.
- * @get_info: Returns a #GDBusInterfaceInfo. See g_dbus_interface_skeleton_get_info() for details.
- * @get_vtable: Returns a #GDBusInterfaceVTable. See g_dbus_interface_skeleton_get_vtable() for details.
- * @get_properties: Returns a #GVariant with all properties. See g_dbus_interface_skeleton_get_properties().
- * @flush: Emits outstanding changes, if any. See g_dbus_interface_skeleton_flush().
- * @g_authorize_method: Signal class handler for the #GDBusInterfaceSkeleton::g-authorize-method signal.
- *
- * Class structure for #GDBusInterfaceSkeleton.
- *
- * Since: 2.30
- */
-struct _GDBusInterfaceSkeletonClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Functions */
-  GDBusInterfaceInfo   *(*get_info)       (GDBusInterfaceSkeleton  *interface_);
-  GDBusInterfaceVTable *(*get_vtable)     (GDBusInterfaceSkeleton  *interface_);
-  GVariant             *(*get_properties) (GDBusInterfaceSkeleton  *interface_);
-  void                  (*flush)          (GDBusInterfaceSkeleton  *interface_);
-
-  /*< private >*/
-  gpointer vfunc_padding[8];
-  /*< public >*/
-
-  /* Signals */
-  gboolean (*g_authorize_method) (GDBusInterfaceSkeleton  *interface_,
-                                  GDBusMethodInvocation   *invocation);
-
-  /*< private >*/
-  gpointer signal_padding[8];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                        g_dbus_interface_skeleton_get_type        (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GDBusInterfaceSkeletonFlags  g_dbus_interface_skeleton_get_flags       (GDBusInterfaceSkeleton      *interface_);
-GLIB_AVAILABLE_IN_ALL
-void                         g_dbus_interface_skeleton_set_flags       (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusInterfaceSkeletonFlags  flags);
-GLIB_AVAILABLE_IN_ALL
-GDBusInterfaceInfo          *g_dbus_interface_skeleton_get_info        (GDBusInterfaceSkeleton      *interface_);
-GLIB_AVAILABLE_IN_ALL
-GDBusInterfaceVTable        *g_dbus_interface_skeleton_get_vtable      (GDBusInterfaceSkeleton      *interface_);
-GLIB_AVAILABLE_IN_ALL
-GVariant                    *g_dbus_interface_skeleton_get_properties  (GDBusInterfaceSkeleton      *interface_);
-GLIB_AVAILABLE_IN_ALL
-void                         g_dbus_interface_skeleton_flush           (GDBusInterfaceSkeleton      *interface_);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                     g_dbus_interface_skeleton_export          (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusConnection             *connection,
-                                                                        const gchar                 *object_path,
-                                                                        GError                     **error);
-GLIB_AVAILABLE_IN_ALL
-void                         g_dbus_interface_skeleton_unexport        (GDBusInterfaceSkeleton      *interface_);
-GLIB_AVAILABLE_IN_ALL
-void                g_dbus_interface_skeleton_unexport_from_connection (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusConnection             *connection);
-
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection             *g_dbus_interface_skeleton_get_connection  (GDBusInterfaceSkeleton      *interface_);
-GLIB_AVAILABLE_IN_ALL
-GList                       *g_dbus_interface_skeleton_get_connections (GDBusInterfaceSkeleton      *interface_);
-GLIB_AVAILABLE_IN_ALL
-gboolean                     g_dbus_interface_skeleton_has_connection  (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusConnection             *connection);
-GLIB_AVAILABLE_IN_ALL
-const gchar                 *g_dbus_interface_skeleton_get_object_path (GDBusInterfaceSkeleton      *interface_);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_INTERFACE_SKELETON_H */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusintrospection.h b/linux-x86/include/glib-2.0/gio/gdbusintrospection.h
deleted file mode 100644
index 32ee784..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusintrospection.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_INTROSPECTION_H__
-#define __G_DBUS_INTROSPECTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GDBusAnnotationInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @key: The name of the annotation, e.g. "org.freedesktop.DBus.Deprecated".
- * @value: The value of the annotation.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about an annotation.
- *
- * Since: 2.26
- */
-struct _GDBusAnnotationInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *key;
-  gchar                *value;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusArgInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: Name of the argument, e.g. @unix_user_id.
- * @signature: D-Bus signature of the argument (a single complete type).
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about an argument for a method or a signal.
- *
- * Since: 2.26
- */
-struct _GDBusArgInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  gchar                *signature;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusMethodInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus method, e.g. @RequestName.
- * @in_args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no in arguments.
- * @out_args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no out arguments.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a method on an D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusMethodInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  GDBusArgInfo        **in_args;
-  GDBusArgInfo        **out_args;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusSignalInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus signal, e.g. "NameOwnerChanged".
- * @args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no arguments.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a signal on a D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusSignalInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  GDBusArgInfo        **args;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusPropertyInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus property, e.g. "SupportedFilesystems".
- * @signature: The D-Bus signature of the property (a single complete type).
- * @flags: Access control flags for the property.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a D-Bus property on a D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusPropertyInfo
-{
-  /*< public >*/
-  volatile gint             ref_count;
-  gchar                    *name;
-  gchar                    *signature;
-  GDBusPropertyInfoFlags    flags;
-  GDBusAnnotationInfo     **annotations;
-};
-
-/**
- * GDBusInterfaceInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus interface, e.g. "org.freedesktop.DBus.Properties".
- * @methods: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusMethodInfo structures or %NULL if there are no methods.
- * @signals: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusSignalInfo structures or %NULL if there are no signals.
- * @properties: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusPropertyInfo structures or %NULL if there are no properties.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusInterfaceInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  GDBusMethodInfo     **methods;
-  GDBusSignalInfo     **signals;
-  GDBusPropertyInfo   **properties;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusNodeInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @path: The path of the node or %NULL if omitted. Note that this may be a relative path. See the D-Bus specification for more details.
- * @interfaces: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusInterfaceInfo structures or %NULL if there are no interfaces.
- * @nodes: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusNodeInfo structures or %NULL if there are no nodes.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about nodes in a remote object hierarchy.
- *
- * Since: 2.26
- */
-struct _GDBusNodeInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *path;
-  GDBusInterfaceInfo  **interfaces;
-  GDBusNodeInfo       **nodes;
-  GDBusAnnotationInfo **annotations;
-};
-
-GLIB_AVAILABLE_IN_ALL
-const gchar        *g_dbus_annotation_info_lookup          (GDBusAnnotationInfo **annotations,
-                                                            const gchar          *name);
-GLIB_AVAILABLE_IN_ALL
-GDBusMethodInfo    *g_dbus_interface_info_lookup_method    (GDBusInterfaceInfo   *info,
-                                                            const gchar          *name);
-GLIB_AVAILABLE_IN_ALL
-GDBusSignalInfo    *g_dbus_interface_info_lookup_signal    (GDBusInterfaceInfo   *info,
-                                                            const gchar          *name);
-GLIB_AVAILABLE_IN_ALL
-GDBusPropertyInfo  *g_dbus_interface_info_lookup_property  (GDBusInterfaceInfo   *info,
-                                                            const gchar          *name);
-GLIB_AVAILABLE_IN_ALL
-void                g_dbus_interface_info_cache_build      (GDBusInterfaceInfo   *info);
-GLIB_AVAILABLE_IN_ALL
-void                g_dbus_interface_info_cache_release    (GDBusInterfaceInfo   *info);
-
-GLIB_AVAILABLE_IN_ALL
-void                g_dbus_interface_info_generate_xml     (GDBusInterfaceInfo   *info,
-                                                            guint                 indent,
-                                                            GString              *string_builder);
-
-GLIB_AVAILABLE_IN_ALL
-GDBusNodeInfo      *g_dbus_node_info_new_for_xml           (const gchar          *xml_data,
-                                                            GError              **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusInterfaceInfo *g_dbus_node_info_lookup_interface      (GDBusNodeInfo        *info,
-                                                            const gchar          *name);
-GLIB_AVAILABLE_IN_ALL
-void                g_dbus_node_info_generate_xml          (GDBusNodeInfo        *info,
-                                                            guint                 indent,
-                                                            GString              *string_builder);
-
-GLIB_AVAILABLE_IN_ALL
-GDBusNodeInfo       *g_dbus_node_info_ref                  (GDBusNodeInfo        *info);
-GLIB_AVAILABLE_IN_ALL
-GDBusInterfaceInfo  *g_dbus_interface_info_ref             (GDBusInterfaceInfo   *info);
-GLIB_AVAILABLE_IN_ALL
-GDBusMethodInfo     *g_dbus_method_info_ref                (GDBusMethodInfo      *info);
-GLIB_AVAILABLE_IN_ALL
-GDBusSignalInfo     *g_dbus_signal_info_ref                (GDBusSignalInfo      *info);
-GLIB_AVAILABLE_IN_ALL
-GDBusPropertyInfo   *g_dbus_property_info_ref              (GDBusPropertyInfo    *info);
-GLIB_AVAILABLE_IN_ALL
-GDBusArgInfo        *g_dbus_arg_info_ref                   (GDBusArgInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-GDBusAnnotationInfo *g_dbus_annotation_info_ref            (GDBusAnnotationInfo  *info);
-
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_node_info_unref                (GDBusNodeInfo        *info);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_interface_info_unref           (GDBusInterfaceInfo   *info);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_method_info_unref              (GDBusMethodInfo      *info);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_signal_info_unref              (GDBusSignalInfo      *info);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_property_info_unref            (GDBusPropertyInfo    *info);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_arg_info_unref                 (GDBusArgInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_annotation_info_unref          (GDBusAnnotationInfo  *info);
-
-/**
- * G_TYPE_DBUS_NODE_INFO:
- *
- * The #GType for a boxed type holding a #GDBusNodeInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_NODE_INFO       (g_dbus_node_info_get_type ())
-
-/**
- * G_TYPE_DBUS_INTERFACE_INFO:
- *
- * The #GType for a boxed type holding a #GDBusInterfaceInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_INTERFACE_INFO  (g_dbus_interface_info_get_type ())
-
-/**
- * G_TYPE_DBUS_METHOD_INFO:
- *
- * The #GType for a boxed type holding a #GDBusMethodInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_METHOD_INFO     (g_dbus_method_info_get_type ())
-
-/**
- * G_TYPE_DBUS_SIGNAL_INFO:
- *
- * The #GType for a boxed type holding a #GDBusSignalInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_SIGNAL_INFO     (g_dbus_signal_info_get_type ())
-
-/**
- * G_TYPE_DBUS_PROPERTY_INFO:
- *
- * The #GType for a boxed type holding a #GDBusPropertyInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_PROPERTY_INFO   (g_dbus_property_info_get_type ())
-
-/**
- * G_TYPE_DBUS_ARG_INFO:
- *
- * The #GType for a boxed type holding a #GDBusArgInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_ARG_INFO        (g_dbus_arg_info_get_type ())
-
-/**
- * G_TYPE_DBUS_ANNOTATION_INFO:
- *
- * The #GType for a boxed type holding a #GDBusAnnotationInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_ANNOTATION_INFO (g_dbus_annotation_info_get_type ())
-
-GLIB_AVAILABLE_IN_ALL
-GType g_dbus_node_info_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType g_dbus_interface_info_get_type  (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType g_dbus_method_info_get_type     (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType g_dbus_signal_info_get_type     (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType g_dbus_property_info_get_type   (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType g_dbus_arg_info_get_type        (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType g_dbus_annotation_info_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_DBUS_INTROSPECTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusmenumodel.h b/linux-x86/include/glib-2.0/gio/gdbusmenumodel.h
deleted file mode 100644
index e0ec520..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusmenumodel.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_DBUS_MENU_MODEL_H__
-#define __G_DBUS_MENU_MODEL_H__
-
-#include <gio/gdbusconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_MENU_MODEL          (g_dbus_menu_model_get_type ())
-#define G_DBUS_MENU_MODEL(inst)         (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
-                                         G_TYPE_DBUS_MENU_MODEL, GDBusMenuModel))
-#define G_IS_DBUS_MENU_MODEL(inst)      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
-                                         G_TYPE_DBUS_MENU_MODEL))
-
-typedef struct _GDBusMenuModel GDBusMenuModel;
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_dbus_menu_model_get_type     (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GDBusMenuModel *        g_dbus_menu_model_get          (GDBusConnection *connection,
-                                                        const gchar     *bus_name,
-                                                        const gchar     *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_MENU_MODEL_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusmessage.h b/linux-x86/include/glib-2.0/gio/gdbusmessage.h
deleted file mode 100644
index bf27f7a..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusmessage.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_MESSAGE_H__
-#define __G_DBUS_MESSAGE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_MESSAGE         (g_dbus_message_get_type ())
-#define G_DBUS_MESSAGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_MESSAGE, GDBusMessage))
-#define G_IS_DBUS_MESSAGE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_MESSAGE))
-
-GLIB_AVAILABLE_IN_ALL
-GType                     g_dbus_message_get_type           (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage             *g_dbus_message_new                (void);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage             *g_dbus_message_new_signal         (const gchar              *path,
-                                                             const gchar              *interface_,
-                                                             const gchar              *signal);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage             *g_dbus_message_new_method_call    (const gchar              *name,
-                                                             const gchar              *path,
-                                                             const gchar              *interface_,
-                                                             const gchar              *method);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage             *g_dbus_message_new_method_reply   (GDBusMessage             *method_call_message);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage             *g_dbus_message_new_method_error   (GDBusMessage             *method_call_message,
-                                                             const gchar              *error_name,
-                                                             const gchar              *error_message_format,
-                                                             ...);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage             *g_dbus_message_new_method_error_valist (GDBusMessage             *method_call_message,
-                                                                  const gchar              *error_name,
-                                                                  const gchar              *error_message_format,
-                                                                  va_list                   var_args);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage             *g_dbus_message_new_method_error_literal (GDBusMessage             *method_call_message,
-                                                                   const gchar              *error_name,
-                                                                   const gchar              *error_message);
-GLIB_AVAILABLE_IN_ALL
-gchar                    *g_dbus_message_print              (GDBusMessage             *message,
-                                                             guint                     indent);
-GLIB_AVAILABLE_IN_ALL
-gboolean                  g_dbus_message_get_locked         (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_lock               (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage             *g_dbus_message_copy               (GDBusMessage             *message,
-                                                             GError                  **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessageByteOrder     g_dbus_message_get_byte_order     (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_byte_order     (GDBusMessage             *message,
-                                                             GDBusMessageByteOrder     byte_order);
-
-GLIB_AVAILABLE_IN_ALL
-GDBusMessageType          g_dbus_message_get_message_type   (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_message_type   (GDBusMessage             *message,
-                                                             GDBusMessageType          type);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessageFlags         g_dbus_message_get_flags          (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_flags          (GDBusMessage             *message,
-                                                             GDBusMessageFlags         flags);
-GLIB_AVAILABLE_IN_ALL
-guint32                   g_dbus_message_get_serial         (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_serial         (GDBusMessage             *message,
-                                                             guint32                   serial);
-GLIB_AVAILABLE_IN_ALL
-GVariant                 *g_dbus_message_get_header         (GDBusMessage             *message,
-                                                             GDBusMessageHeaderField   header_field);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_header         (GDBusMessage             *message,
-                                                             GDBusMessageHeaderField   header_field,
-                                                             GVariant                 *value);
-GLIB_AVAILABLE_IN_ALL
-guchar                   *g_dbus_message_get_header_fields  (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-GVariant                 *g_dbus_message_get_body           (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_body           (GDBusMessage             *message,
-                                                             GVariant                 *body);
-GLIB_AVAILABLE_IN_ALL
-GUnixFDList              *g_dbus_message_get_unix_fd_list   (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_unix_fd_list   (GDBusMessage             *message,
-                                                             GUnixFDList              *fd_list);
-
-GLIB_AVAILABLE_IN_ALL
-guint32                   g_dbus_message_get_reply_serial   (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_reply_serial   (GDBusMessage             *message,
-                                                             guint32                   value);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar              *g_dbus_message_get_interface      (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_interface      (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar              *g_dbus_message_get_member         (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_member         (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar              *g_dbus_message_get_path           (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_path           (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar              *g_dbus_message_get_sender         (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_sender         (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar              *g_dbus_message_get_destination    (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_destination    (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar              *g_dbus_message_get_error_name     (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_error_name     (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar              *g_dbus_message_get_signature      (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_signature      (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-GLIB_AVAILABLE_IN_ALL
-guint32                   g_dbus_message_get_num_unix_fds   (GDBusMessage             *message);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_message_set_num_unix_fds   (GDBusMessage             *message,
-                                                             guint32                   value);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar              *g_dbus_message_get_arg0           (GDBusMessage             *message);
-
-
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage             *g_dbus_message_new_from_blob      (guchar                   *blob,
-                                                             gsize                     blob_len,
-                                                             GDBusCapabilityFlags      capabilities,
-                                                             GError                  **error);
-
-GLIB_AVAILABLE_IN_ALL
-gssize                    g_dbus_message_bytes_needed       (guchar                   *blob,
-                                                             gsize                     blob_len,
-                                                             GError                  **error);
-
-GLIB_AVAILABLE_IN_ALL
-guchar                   *g_dbus_message_to_blob            (GDBusMessage             *message,
-                                                             gsize                    *out_size,
-                                                             GDBusCapabilityFlags      capabilities,
-                                                             GError                  **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                  g_dbus_message_to_gerror          (GDBusMessage             *message,
-                                                             GError                  **error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_MESSAGE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusmethodinvocation.h b/linux-x86/include/glib-2.0/gio/gdbusmethodinvocation.h
deleted file mode 100644
index 7fd4aff..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusmethodinvocation.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_METHOD_INVOCATION_H__
-#define __G_DBUS_METHOD_INVOCATION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_METHOD_INVOCATION         (g_dbus_method_invocation_get_type ())
-#define G_DBUS_METHOD_INVOCATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_METHOD_INVOCATION, GDBusMethodInvocation))
-#define G_IS_DBUS_METHOD_INVOCATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_METHOD_INVOCATION))
-
-GLIB_AVAILABLE_IN_ALL
-GType                  g_dbus_method_invocation_get_type             (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-const gchar           *g_dbus_method_invocation_get_sender           (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
-const gchar           *g_dbus_method_invocation_get_object_path      (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
-const gchar           *g_dbus_method_invocation_get_interface_name   (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
-const gchar           *g_dbus_method_invocation_get_method_name      (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
-const GDBusMethodInfo *g_dbus_method_invocation_get_method_info      (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_2_38
-const GDBusPropertyInfo *g_dbus_method_invocation_get_property_info  (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection       *g_dbus_method_invocation_get_connection       (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
-GDBusMessage          *g_dbus_method_invocation_get_message          (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
-GVariant              *g_dbus_method_invocation_get_parameters       (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
-gpointer               g_dbus_method_invocation_get_user_data        (GDBusMethodInvocation *invocation);
-
-GLIB_AVAILABLE_IN_ALL
-void                   g_dbus_method_invocation_return_value         (GDBusMethodInvocation *invocation,
-                                                                      GVariant              *parameters);
-GLIB_AVAILABLE_IN_ALL
-void                   g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation *invocation,
-                                                                                GVariant              *parameters,
-                                                                                GUnixFDList           *fd_list);
-GLIB_AVAILABLE_IN_ALL
-void                   g_dbus_method_invocation_return_error         (GDBusMethodInvocation *invocation,
-                                                                      GQuark                 domain,
-                                                                      gint                   code,
-                                                                      const gchar           *format,
-                                                                      ...) G_GNUC_PRINTF(4, 5);
-GLIB_AVAILABLE_IN_ALL
-void                   g_dbus_method_invocation_return_error_valist  (GDBusMethodInvocation *invocation,
-                                                                      GQuark                 domain,
-                                                                      gint                   code,
-                                                                      const gchar           *format,
-                                                                      va_list                var_args)
-                                                                      G_GNUC_PRINTF(4, 0);
-GLIB_AVAILABLE_IN_ALL
-void                   g_dbus_method_invocation_return_error_literal (GDBusMethodInvocation *invocation,
-                                                                      GQuark                 domain,
-                                                                      gint                   code,
-                                                                      const gchar           *message);
-GLIB_AVAILABLE_IN_ALL
-void                   g_dbus_method_invocation_return_gerror        (GDBusMethodInvocation *invocation,
-                                                                      const GError          *error);
-GLIB_AVAILABLE_IN_ALL
-void                   g_dbus_method_invocation_take_error           (GDBusMethodInvocation *invocation,
-                                                                      GError                *error);
-GLIB_AVAILABLE_IN_ALL
-void                   g_dbus_method_invocation_return_dbus_error    (GDBusMethodInvocation *invocation,
-                                                                      const gchar           *error_name,
-                                                                      const gchar           *error_message);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_METHOD_INVOCATION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusnameowning.h b/linux-x86/include/glib-2.0/gio/gdbusnameowning.h
deleted file mode 100644
index 6e69bff..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusnameowning.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_NAME_OWNING_H__
-#define __G_DBUS_NAME_OWNING_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GBusAcquiredCallback:
- * @connection: The #GDBusConnection to a message bus.
- * @name: The name that is requested to be owned.
- * @user_data: User data passed to g_bus_own_name().
- *
- * Invoked when a connection to a message bus has been obtained.
- *
- * Since: 2.26
- */
-typedef void (*GBusAcquiredCallback) (GDBusConnection *connection,
-                                      const gchar     *name,
-                                      gpointer         user_data);
-
-/**
- * GBusNameAcquiredCallback:
- * @connection: The #GDBusConnection on which to acquired the name.
- * @name: The name being owned.
- * @user_data: User data passed to g_bus_own_name() or g_bus_own_name_on_connection().
- *
- * Invoked when the name is acquired.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameAcquiredCallback) (GDBusConnection *connection,
-                                          const gchar     *name,
-                                          gpointer         user_data);
-
-/**
- * GBusNameLostCallback:
- * @connection: The #GDBusConnection on which to acquire the name or %NULL if
- * the connection was disconnected.
- * @name: The name being owned.
- * @user_data: User data passed to g_bus_own_name() or g_bus_own_name_on_connection().
- *
- * Invoked when the name is lost or @connection has been closed.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameLostCallback) (GDBusConnection *connection,
-                                      const gchar     *name,
-                                      gpointer         user_data);
-
-GLIB_AVAILABLE_IN_ALL
-guint g_bus_own_name                 (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GBusAcquiredCallback      bus_acquired_handler,
-                                      GBusNameAcquiredCallback  name_acquired_handler,
-                                      GBusNameLostCallback      name_lost_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-
-GLIB_AVAILABLE_IN_ALL
-guint g_bus_own_name_on_connection   (GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GBusNameAcquiredCallback  name_acquired_handler,
-                                      GBusNameLostCallback      name_lost_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-
-GLIB_AVAILABLE_IN_ALL
-guint g_bus_own_name_with_closures   (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GClosure                 *bus_acquired_closure,
-                                      GClosure                 *name_acquired_closure,
-                                      GClosure                 *name_lost_closure);
-
-GLIB_AVAILABLE_IN_ALL
-guint g_bus_own_name_on_connection_with_closures (
-                                      GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GClosure                 *name_acquired_closure,
-                                      GClosure                 *name_lost_closure);
-
-GLIB_AVAILABLE_IN_ALL
-void  g_bus_unown_name               (guint                     owner_id);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_NAME_OWNING_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusnamewatching.h b/linux-x86/include/glib-2.0/gio/gdbusnamewatching.h
deleted file mode 100644
index 85607bf..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusnamewatching.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_NAME_WATCHING_H__
-#define __G_DBUS_NAME_WATCHING_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GBusNameAppearedCallback:
- * @connection: The #GDBusConnection the name is being watched on.
- * @name: The name being watched.
- * @name_owner: Unique name of the owner of the name being watched.
- * @user_data: User data passed to g_bus_watch_name().
- *
- * Invoked when the name being watched is known to have to have a owner.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameAppearedCallback) (GDBusConnection *connection,
-                                          const gchar     *name,
-                                          const gchar     *name_owner,
-                                          gpointer         user_data);
-
-/**
- * GBusNameVanishedCallback:
- * @connection: The #GDBusConnection the name is being watched on, or
- *     %NULL.
- * @name: The name being watched.
- * @user_data: User data passed to g_bus_watch_name().
- *
- * Invoked when the name being watched is known not to have to have a owner.
- *
- * This is also invoked when the #GDBusConection on which the watch was
- * established has been closed.  In that case, @connection will be
- * %NULL.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameVanishedCallback) (GDBusConnection *connection,
-                                          const gchar     *name,
-                                          gpointer         user_data);
-
-
-GLIB_AVAILABLE_IN_ALL
-guint g_bus_watch_name               (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GBusNameAppearedCallback  name_appeared_handler,
-                                      GBusNameVanishedCallback  name_vanished_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-GLIB_AVAILABLE_IN_ALL
-guint g_bus_watch_name_on_connection (GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GBusNameAppearedCallback  name_appeared_handler,
-                                      GBusNameVanishedCallback  name_vanished_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-GLIB_AVAILABLE_IN_ALL
-guint g_bus_watch_name_with_closures (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GClosure                 *name_appeared_closure,
-                                      GClosure                 *name_vanished_closure);
-GLIB_AVAILABLE_IN_ALL
-guint g_bus_watch_name_on_connection_with_closures (
-                                      GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GClosure                 *name_appeared_closure,
-                                      GClosure                 *name_vanished_closure);
-GLIB_AVAILABLE_IN_ALL
-void  g_bus_unwatch_name             (guint                     watcher_id);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_NAME_WATCHING_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusobject.h b/linux-x86/include/glib-2.0/gio/gdbusobject.h
deleted file mode 100644
index ad6c4d8..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusobject.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_H__
-#define __G_DBUS_OBJECT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT         (g_dbus_object_get_type())
-#define G_DBUS_OBJECT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT, GDBusObject))
-#define G_IS_DBUS_OBJECT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT))
-#define G_DBUS_OBJECT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), G_TYPE_DBUS_OBJECT, GDBusObjectIface))
-
-typedef struct _GDBusObjectIface GDBusObjectIface;
-
-/**
- * GDBusObjectIface:
- * @parent_iface: The parent interface.
- * @get_object_path: Returns the object path. See g_dbus_object_get_object_path().
- * @get_interfaces: Returns all interfaces. See g_dbus_object_get_interfaces().
- * @get_interface: Returns an interface by name. See g_dbus_object_get_interface().
- * @interface_added: Signal handler for the #GDBusObject::interface-added signal.
- * @interface_removed: Signal handler for the #GDBusObject::interface-removed signal.
- *
- * Base object type for D-Bus objects.
- *
- * Since: 2.30
- */
-struct _GDBusObjectIface
-{
-  GTypeInterface parent_iface;
-
-  /* Virtual Functions */
-  const gchar     *(*get_object_path) (GDBusObject  *object);
-  GList           *(*get_interfaces)  (GDBusObject  *object);
-  GDBusInterface  *(*get_interface)   (GDBusObject  *object,
-                                       const gchar  *interface_name);
-
-  /* Signals */
-  void (*interface_added)   (GDBusObject     *object,
-                             GDBusInterface  *interface_);
-  void (*interface_removed) (GDBusObject     *object,
-                             GDBusInterface  *interface_);
-
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType            g_dbus_object_get_type        (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-const gchar     *g_dbus_object_get_object_path (GDBusObject  *object);
-GLIB_AVAILABLE_IN_ALL
-GList           *g_dbus_object_get_interfaces  (GDBusObject  *object);
-GLIB_AVAILABLE_IN_ALL
-GDBusInterface  *g_dbus_object_get_interface   (GDBusObject  *object,
-                                                const gchar  *interface_name);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusobjectmanager.h b/linux-x86/include/glib-2.0/gio/gdbusobjectmanager.h
deleted file mode 100644
index bc00c5e..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusobjectmanager.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_MANAGER_H__
-#define __G_DBUS_OBJECT_MANAGER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_MANAGER         (g_dbus_object_manager_get_type())
-#define G_DBUS_OBJECT_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_MANAGER, GDBusObjectManager))
-#define G_IS_DBUS_OBJECT_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_MANAGER))
-#define G_DBUS_OBJECT_MANAGER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), G_TYPE_DBUS_OBJECT_MANAGER, GDBusObjectManagerIface))
-
-typedef struct _GDBusObjectManagerIface GDBusObjectManagerIface;
-
-/**
- * GDBusObjectManagerIface:
- * @parent_iface: The parent interface.
- * @get_object_path: Virtual function for g_dbus_object_manager_get_object_path().
- * @get_objects: Virtual function for g_dbus_object_manager_get_objects().
- * @get_object: Virtual function for g_dbus_object_manager_get_object().
- * @get_interface: Virtual function for g_dbus_object_manager_get_interface().
- * @object_added: Signal handler for the #GDBusObjectManager::object-added signal.
- * @object_removed: Signal handler for the #GDBusObjectManager::object-removed signal.
- * @interface_added: Signal handler for the #GDBusObjectManager::interface-added signal.
- * @interface_removed: Signal handler for the #GDBusObjectManager::interface-removed signal.
- *
- * Base type for D-Bus object managers.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerIface
-{
-  GTypeInterface parent_iface;
-
-  /* Virtual Functions */
-  const gchar     *(*get_object_path) (GDBusObjectManager    *manager);
-  GList           *(*get_objects)     (GDBusObjectManager    *manager);
-  GDBusObject     *(*get_object)      (GDBusObjectManager    *manager,
-                                       const gchar           *object_path);
-  GDBusInterface  *(*get_interface)   (GDBusObjectManager    *manager,
-                                       const gchar           *object_path,
-                                       const gchar           *interface_name);
-
-  /* Signals */
-  void    (*object_added)                 (GDBusObjectManager   *manager,
-                                           GDBusObject          *object);
-  void    (*object_removed)               (GDBusObjectManager   *manager,
-                                           GDBusObject          *object);
-
-  void    (*interface_added)              (GDBusObjectManager   *manager,
-                                           GDBusObject          *object,
-                                           GDBusInterface       *interface_);
-  void    (*interface_removed)            (GDBusObjectManager   *manager,
-                                           GDBusObject          *object,
-                                           GDBusInterface       *interface_);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType            g_dbus_object_manager_get_type        (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-const gchar     *g_dbus_object_manager_get_object_path (GDBusObjectManager    *manager);
-GLIB_AVAILABLE_IN_ALL
-GList           *g_dbus_object_manager_get_objects     (GDBusObjectManager    *manager);
-GLIB_AVAILABLE_IN_ALL
-GDBusObject     *g_dbus_object_manager_get_object      (GDBusObjectManager    *manager,
-                                                        const gchar           *object_path);
-GLIB_AVAILABLE_IN_ALL
-GDBusInterface  *g_dbus_object_manager_get_interface   (GDBusObjectManager    *manager,
-                                                        const gchar           *object_path,
-                                                        const gchar           *interface_name);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_MANAGER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusobjectmanagerclient.h b/linux-x86/include/glib-2.0/gio/gdbusobjectmanagerclient.h
deleted file mode 100644
index 91d45a8..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusobjectmanagerclient.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_MANAGER_CLIENT_H__
-#define __G_DBUS_OBJECT_MANAGER_CLIENT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_MANAGER_CLIENT         (g_dbus_object_manager_client_get_type ())
-#define G_DBUS_OBJECT_MANAGER_CLIENT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT, GDBusObjectManagerClient))
-#define G_DBUS_OBJECT_MANAGER_CLIENT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT, GDBusObjectManagerClientClass))
-#define G_DBUS_OBJECT_MANAGER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT, GDBusObjectManagerClientClass))
-#define G_IS_DBUS_OBJECT_MANAGER_CLIENT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT))
-#define G_IS_DBUS_OBJECT_MANAGER_CLIENT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT))
-
-typedef struct _GDBusObjectManagerClientClass   GDBusObjectManagerClientClass;
-typedef struct _GDBusObjectManagerClientPrivate GDBusObjectManagerClientPrivate;
-
-/**
- * GDBusObjectManagerClient:
-  *
- * The #GDBusObjectManagerClient structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerClient
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectManagerClientPrivate *priv;
-};
-
-/**
- * GDBusObjectManagerClientClass:
- * @parent_class: The parent class.
- * @interface_proxy_signal: Signal class handler for the #GDBusObjectManagerClient::interface-proxy-signal signal.
- * @interface_proxy_properties_changed: Signal class handler for the #GDBusObjectManagerClient::interface-proxy-properties-changed signal.
- *
- * Class structure for #GDBusObjectManagerClient.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerClientClass
-{
-  GObjectClass parent_class;
-
-  /* signals */
-  void    (*interface_proxy_signal)             (GDBusObjectManagerClient *manager,
-                                                 GDBusObjectProxy         *object_proxy,
-                                                 GDBusProxy               *interface_proxy,
-                                                 const gchar              *sender_name,
-                                                 const gchar              *signal_name,
-                                                 GVariant                 *parameters);
-
-  void    (*interface_proxy_properties_changed) (GDBusObjectManagerClient   *manager,
-                                                 GDBusObjectProxy           *object_proxy,
-                                                 GDBusProxy                 *interface_proxy,
-                                                 GVariant                   *changed_properties,
-                                                 const gchar* const         *invalidated_properties);
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                         g_dbus_object_manager_client_get_type           (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-void                          g_dbus_object_manager_client_new                (GDBusConnection               *connection,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GAsyncReadyCallback            callback,
-                                                                               gpointer                       user_data);
-GLIB_AVAILABLE_IN_ALL
-GDBusObjectManager           *g_dbus_object_manager_client_new_finish         (GAsyncResult                  *res,
-                                                                               GError                       **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusObjectManager           *g_dbus_object_manager_client_new_sync           (GDBusConnection               *connection,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GError                       **error);
-GLIB_AVAILABLE_IN_ALL
-void                          g_dbus_object_manager_client_new_for_bus        (GBusType                       bus_type,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GAsyncReadyCallback            callback,
-                                                                               gpointer                       user_data);
-GLIB_AVAILABLE_IN_ALL
-GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_finish (GAsyncResult                  *res,
-                                                                               GError                       **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_sync   (GBusType                       bus_type,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GError                       **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection              *g_dbus_object_manager_client_get_connection     (GDBusObjectManagerClient      *manager);
-GLIB_AVAILABLE_IN_ALL
-GDBusObjectManagerClientFlags g_dbus_object_manager_client_get_flags          (GDBusObjectManagerClient      *manager);
-GLIB_AVAILABLE_IN_ALL
-const gchar                  *g_dbus_object_manager_client_get_name           (GDBusObjectManagerClient      *manager);
-GLIB_AVAILABLE_IN_ALL
-gchar                        *g_dbus_object_manager_client_get_name_owner     (GDBusObjectManagerClient      *manager);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_MANAGER_CLIENT_H */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusobjectmanagerserver.h b/linux-x86/include/glib-2.0/gio/gdbusobjectmanagerserver.h
deleted file mode 100644
index cd7bb4b..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusobjectmanagerserver.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_MANAGER_SERVER_H__
-#define __G_DBUS_OBJECT_MANAGER_SERVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_MANAGER_SERVER         (g_dbus_object_manager_server_get_type ())
-#define G_DBUS_OBJECT_MANAGER_SERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_MANAGER_SERVER, GDBusObjectManagerServer))
-#define G_DBUS_OBJECT_MANAGER_SERVER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_MANAGER_SERVER, GDBusObjectManagerServerClass))
-#define G_DBUS_OBJECT_MANAGER_SERVER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_MANAGER_SERVER, GDBusObjectManagerServerClass))
-#define G_IS_DBUS_OBJECT_MANAGER_SERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_MANAGER_SERVER))
-#define G_IS_DBUS_OBJECT_MANAGER_SERVER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_MANAGER_SERVER))
-
-typedef struct _GDBusObjectManagerServerClass   GDBusObjectManagerServerClass;
-typedef struct _GDBusObjectManagerServerPrivate GDBusObjectManagerServerPrivate;
-
-/**
- * GDBusObjectManagerServer:
- *
- * The #GDBusObjectManagerServer structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerServer
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectManagerServerPrivate *priv;
-};
-
-/**
- * GDBusObjectManagerServerClass:
- * @parent_class: The parent class.
- *
- * Class structure for #GDBusObjectManagerServer.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerServerClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                     g_dbus_object_manager_server_get_type            (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GDBusObjectManagerServer *g_dbus_object_manager_server_new                 (const gchar               *object_path);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection          *g_dbus_object_manager_server_get_connection      (GDBusObjectManagerServer  *manager);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_object_manager_server_set_connection      (GDBusObjectManagerServer  *manager,
-                                                                            GDBusConnection           *connection);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_object_manager_server_export              (GDBusObjectManagerServer  *manager,
-                                                                            GDBusObjectSkeleton       *object);
-GLIB_AVAILABLE_IN_ALL
-void                      g_dbus_object_manager_server_export_uniquely     (GDBusObjectManagerServer  *manager,
-                                                                            GDBusObjectSkeleton       *object);
-GLIB_AVAILABLE_IN_ALL
-gboolean                  g_dbus_object_manager_server_is_exported         (GDBusObjectManagerServer  *manager,
-                                                                            GDBusObjectSkeleton       *object);
-GLIB_AVAILABLE_IN_ALL
-gboolean                  g_dbus_object_manager_server_unexport            (GDBusObjectManagerServer  *manager,
-                                                                            const gchar               *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_MANAGER_SERVER_H */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusobjectproxy.h b/linux-x86/include/glib-2.0/gio/gdbusobjectproxy.h
deleted file mode 100644
index 8fe7416..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusobjectproxy.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_PROXY_H__
-#define __G_DBUS_OBJECT_PROXY_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_PROXY         (g_dbus_object_proxy_get_type ())
-#define G_DBUS_OBJECT_PROXY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_PROXY, GDBusObjectProxy))
-#define G_DBUS_OBJECT_PROXY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_PROXY, GDBusObjectProxyClass))
-#define G_DBUS_OBJECT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_PROXY, GDBusObjectProxyClass))
-#define G_IS_DBUS_OBJECT_PROXY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_PROXY))
-#define G_IS_DBUS_OBJECT_PROXY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_PROXY))
-
-typedef struct _GDBusObjectProxyClass   GDBusObjectProxyClass;
-typedef struct _GDBusObjectProxyPrivate GDBusObjectProxyPrivate;
-
-/**
- * GDBusObjectProxy:
- *
- * The #GDBusObjectProxy structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectProxy
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectProxyPrivate *priv;
-};
-
-/**
- * GDBusObjectProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #GDBusObjectProxy.
- *
- * Since: 2.30
- */
-struct _GDBusObjectProxyClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType             g_dbus_object_proxy_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GDBusObjectProxy *g_dbus_object_proxy_new            (GDBusConnection   *connection,
-                                                      const gchar       *object_path);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection  *g_dbus_object_proxy_get_connection (GDBusObjectProxy  *proxy);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_PROXY_H */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusobjectskeleton.h b/linux-x86/include/glib-2.0/gio/gdbusobjectskeleton.h
deleted file mode 100644
index 3bce873..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusobjectskeleton.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_SKELETON_H__
-#define __G_DBUS_OBJECT_SKELETON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_SKELETON         (g_dbus_object_skeleton_get_type ())
-#define G_DBUS_OBJECT_SKELETON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_SKELETON, GDBusObjectSkeleton))
-#define G_DBUS_OBJECT_SKELETON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_SKELETON, GDBusObjectSkeletonClass))
-#define G_DBUS_OBJECT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_SKELETON, GDBusObjectSkeletonClass))
-#define G_IS_DBUS_OBJECT_SKELETON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_SKELETON))
-#define G_IS_DBUS_OBJECT_SKELETON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_SKELETON))
-
-typedef struct _GDBusObjectSkeletonClass   GDBusObjectSkeletonClass;
-typedef struct _GDBusObjectSkeletonPrivate GDBusObjectSkeletonPrivate;
-
-/**
- * GDBusObjectSkeleton:
- *
- * The #GDBusObjectSkeleton structure contains private data and should only be
- * accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectSkeleton
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectSkeletonPrivate *priv;
-};
-
-/**
- * GDBusObjectSkeletonClass:
- * @parent_class: The parent class.
- * @authorize_method: Signal class handler for the #GDBusObjectSkeleton::authorize-method signal.
- *
- * Class structure for #GDBusObjectSkeleton.
- *
- * Since: 2.30
- */
-struct _GDBusObjectSkeletonClass
-{
-  GObjectClass parent_class;
-
-  /* Signals */
-  gboolean (*authorize_method) (GDBusObjectSkeleton       *object,
-                                GDBusInterfaceSkeleton    *interface_,
-                                GDBusMethodInvocation *invocation);
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                g_dbus_object_skeleton_get_type                  (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GDBusObjectSkeleton *g_dbus_object_skeleton_new                       (const gchar            *object_path);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_object_skeleton_flush                     (GDBusObjectSkeleton    *object);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_object_skeleton_add_interface             (GDBusObjectSkeleton    *object,
-                                                                       GDBusInterfaceSkeleton *interface_);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_object_skeleton_remove_interface          (GDBusObjectSkeleton    *object,
-                                                                       GDBusInterfaceSkeleton *interface_);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_object_skeleton_remove_interface_by_name  (GDBusObjectSkeleton    *object,
-                                                                       const gchar            *interface_name);
-GLIB_AVAILABLE_IN_ALL
-void                 g_dbus_object_skeleton_set_object_path           (GDBusObjectSkeleton    *object,
-                                                                       const gchar            *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_SKELETON_H */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusproxy.h b/linux-x86/include/glib-2.0/gio/gdbusproxy.h
deleted file mode 100644
index 18a9138..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusproxy.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_PROXY_H__
-#define __G_DBUS_PROXY_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-#include <gio/gdbusintrospection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_PROXY         (g_dbus_proxy_get_type ())
-#define G_DBUS_PROXY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_PROXY, GDBusProxy))
-#define G_DBUS_PROXY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_PROXY, GDBusProxyClass))
-#define G_DBUS_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_PROXY, GDBusProxyClass))
-#define G_IS_DBUS_PROXY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_PROXY))
-#define G_IS_DBUS_PROXY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_PROXY))
-
-typedef struct _GDBusProxyClass   GDBusProxyClass;
-typedef struct _GDBusProxyPrivate GDBusProxyPrivate;
-
-/**
- * GDBusProxy:
- *
- * The #GDBusProxy structure contains only private data and
- * should only be accessed using the provided API.
- *
- * Since: 2.26
- */
-struct _GDBusProxy
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusProxyPrivate *priv;
-};
-
-/**
- * GDBusProxyClass:
- * @g_properties_changed: Signal class handler for the #GDBusProxy::g-properties-changed signal.
- * @g_signal: Signal class handler for the #GDBusProxy::g-signal signal.
- *
- * Class structure for #GDBusProxy.
- *
- * Since: 2.26
- */
-struct _GDBusProxyClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* Signals */
-  void (*g_properties_changed) (GDBusProxy          *proxy,
-                                GVariant            *changed_properties,
-                                const gchar* const  *invalidated_properties);
-  void (*g_signal)             (GDBusProxy          *proxy,
-                                const gchar         *sender_name,
-                                const gchar         *signal_name,
-                                GVariant            *parameters);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[32];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType            g_dbus_proxy_get_type                  (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_proxy_new                       (GDBusConnection     *connection,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GAsyncReadyCallback  callback,
-                                                         gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-GDBusProxy      *g_dbus_proxy_new_finish                (GAsyncResult        *res,
-                                                         GError             **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusProxy      *g_dbus_proxy_new_sync                  (GDBusConnection     *connection,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GError             **error);
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_proxy_new_for_bus               (GBusType             bus_type,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GAsyncReadyCallback  callback,
-                                                         gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-GDBusProxy      *g_dbus_proxy_new_for_bus_finish        (GAsyncResult        *res,
-                                                         GError             **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusProxy      *g_dbus_proxy_new_for_bus_sync          (GBusType             bus_type,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GError             **error);
-GLIB_AVAILABLE_IN_ALL
-GDBusConnection *g_dbus_proxy_get_connection            (GDBusProxy          *proxy);
-GLIB_AVAILABLE_IN_ALL
-GDBusProxyFlags  g_dbus_proxy_get_flags                 (GDBusProxy          *proxy);
-GLIB_AVAILABLE_IN_ALL
-const gchar     *g_dbus_proxy_get_name                  (GDBusProxy          *proxy);
-GLIB_AVAILABLE_IN_ALL
-gchar           *g_dbus_proxy_get_name_owner            (GDBusProxy          *proxy);
-GLIB_AVAILABLE_IN_ALL
-const gchar     *g_dbus_proxy_get_object_path           (GDBusProxy          *proxy);
-GLIB_AVAILABLE_IN_ALL
-const gchar     *g_dbus_proxy_get_interface_name        (GDBusProxy          *proxy);
-GLIB_AVAILABLE_IN_ALL
-gint             g_dbus_proxy_get_default_timeout       (GDBusProxy          *proxy);
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_proxy_set_default_timeout       (GDBusProxy          *proxy,
-                                                         gint                 timeout_msec);
-GLIB_AVAILABLE_IN_ALL
-GDBusInterfaceInfo *g_dbus_proxy_get_interface_info     (GDBusProxy          *proxy);
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_proxy_set_interface_info        (GDBusProxy           *proxy,
-                                                         GDBusInterfaceInfo   *info);
-GLIB_AVAILABLE_IN_ALL
-GVariant        *g_dbus_proxy_get_cached_property       (GDBusProxy          *proxy,
-                                                         const gchar         *property_name);
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_proxy_set_cached_property       (GDBusProxy          *proxy,
-                                                         const gchar         *property_name,
-                                                         GVariant            *value);
-GLIB_AVAILABLE_IN_ALL
-gchar          **g_dbus_proxy_get_cached_property_names (GDBusProxy          *proxy);
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_proxy_call                      (GDBusProxy          *proxy,
-                                                         const gchar         *method_name,
-                                                         GVariant            *parameters,
-                                                         GDBusCallFlags       flags,
-                                                         gint                 timeout_msec,
-                                                         GCancellable        *cancellable,
-                                                         GAsyncReadyCallback  callback,
-                                                         gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-GVariant        *g_dbus_proxy_call_finish               (GDBusProxy          *proxy,
-                                                         GAsyncResult        *res,
-                                                         GError             **error);
-GLIB_AVAILABLE_IN_ALL
-GVariant        *g_dbus_proxy_call_sync                 (GDBusProxy          *proxy,
-                                                         const gchar         *method_name,
-                                                         GVariant            *parameters,
-                                                         GDBusCallFlags       flags,
-                                                         gint                 timeout_msec,
-                                                         GCancellable        *cancellable,
-                                                         GError             **error);
-
-GLIB_AVAILABLE_IN_ALL
-void             g_dbus_proxy_call_with_unix_fd_list        (GDBusProxy          *proxy,
-                                                             const gchar         *method_name,
-                                                             GVariant            *parameters,
-                                                             GDBusCallFlags       flags,
-                                                             gint                 timeout_msec,
-                                                             GUnixFDList         *fd_list,
-                                                             GCancellable        *cancellable,
-                                                             GAsyncReadyCallback  callback,
-                                                             gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-GVariant        *g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy          *proxy,
-                                                             GUnixFDList        **out_fd_list,
-                                                             GAsyncResult        *res,
-                                                             GError             **error);
-GLIB_AVAILABLE_IN_ALL
-GVariant        *g_dbus_proxy_call_with_unix_fd_list_sync   (GDBusProxy          *proxy,
-                                                             const gchar         *method_name,
-                                                             GVariant            *parameters,
-                                                             GDBusCallFlags       flags,
-                                                             gint                 timeout_msec,
-                                                             GUnixFDList         *fd_list,
-                                                             GUnixFDList        **out_fd_list,
-                                                             GCancellable        *cancellable,
-                                                             GError             **error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_PROXY_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusserver.h b/linux-x86/include/glib-2.0/gio/gdbusserver.h
deleted file mode 100644
index 05557f0..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusserver.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_SERVER_H__
-#define __G_DBUS_SERVER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_SERVER         (g_dbus_server_get_type ())
-#define G_DBUS_SERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_SERVER, GDBusServer))
-#define G_IS_DBUS_SERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_SERVER))
-
-GLIB_AVAILABLE_IN_ALL
-GType             g_dbus_server_get_type           (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GDBusServer      *g_dbus_server_new_sync           (const gchar       *address,
-                                                    GDBusServerFlags   flags,
-                                                    const gchar       *guid,
-                                                    GDBusAuthObserver *observer,
-                                                    GCancellable      *cancellable,
-                                                    GError           **error);
-GLIB_AVAILABLE_IN_ALL
-const gchar      *g_dbus_server_get_client_address (GDBusServer       *server);
-GLIB_AVAILABLE_IN_ALL
-const gchar      *g_dbus_server_get_guid           (GDBusServer       *server);
-GLIB_AVAILABLE_IN_ALL
-GDBusServerFlags  g_dbus_server_get_flags          (GDBusServer       *server);
-GLIB_AVAILABLE_IN_ALL
-void              g_dbus_server_start              (GDBusServer       *server);
-GLIB_AVAILABLE_IN_ALL
-void              g_dbus_server_stop               (GDBusServer       *server);
-GLIB_AVAILABLE_IN_ALL
-gboolean          g_dbus_server_is_active          (GDBusServer       *server);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_SERVER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdbusutils.h b/linux-x86/include/glib-2.0/gio/gdbusutils.h
deleted file mode 100644
index 6ef2ffd..0000000
--- a/linux-x86/include/glib-2.0/gio/gdbusutils.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_UTILS_H__
-#define __G_DBUS_UTILS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_is_guid (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
-gchar *g_dbus_generate_guid (void);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_is_name (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_is_unique_name (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_is_member_name (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_dbus_is_interface_name (const gchar *string);
-
-GLIB_AVAILABLE_IN_ALL
-void g_dbus_gvariant_to_gvalue (GVariant  *value,
-                                GValue    *out_gvalue);
-GLIB_AVAILABLE_IN_ALL
-GVariant *g_dbus_gvalue_to_gvariant (const GValue         *gvalue,
-                                     const GVariantType   *type);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_UTILS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gdrive.h b/linux-x86/include/glib-2.0/gio/gdrive.h
deleted file mode 100644
index 13c02ae..0000000
--- a/linux-x86/include/glib-2.0/gio/gdrive.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DRIVE_H__
-#define __G_DRIVE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DRIVE           (g_drive_get_type ())
-#define G_DRIVE(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DRIVE, GDrive))
-#define G_IS_DRIVE(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DRIVE))
-#define G_DRIVE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_DRIVE, GDriveIface))
-
-/**
- * GDriveIface:
- * @g_iface: The parent interface.
- * @changed: Signal emitted when the drive is changed.
- * @disconnected: The removed signal that is emitted when the #GDrive have been disconnected. If the recipient is holding references to the object they should release them so the object can be finalized.
- * @eject_button: Signal emitted when the physical eject button (if any) of a drive have been pressed.
- * @get_name: Returns the name for the given #GDrive.
- * @get_icon: Returns a #GIcon for the given #GDrive.
- * @has_volumes: Returns %TRUE if the #GDrive has mountable volumes.
- * @get_volumes: Returns a list #GList of #GVolume for the #GDrive.
- * @is_media_removable: Returns %TRUE if the #GDrive supports removal and insertion of media.
- * @has_media: Returns %TRUE if the #GDrive has media inserted.
- * @is_media_check_automatic: Returns %TRUE if the #GDrive is capabable of automatically detecting media changes.
- * @can_poll_for_media: Returns %TRUE if the #GDrive is capable of manually polling for media change.
- * @can_eject: Returns %TRUE if the #GDrive can eject media.
- * @eject: Ejects a #GDrive.
- * @eject_finish: Finishes an eject operation.
- * @poll_for_media: Poll for media insertion/removal on a #GDrive.
- * @poll_for_media_finish: Finishes a media poll operation.
- * @get_identifier: Returns the identifier of the given kind, or %NULL if
- *    the #GDrive doesn't have one.
- * @enumerate_identifiers: Returns an array strings listing the kinds
- *    of identifiers which the #GDrive has.
- * @get_start_stop_type: Gets a #GDriveStartStopType with details about starting/stopping the drive. Since 2.22.
- * @can_stop: Returns %TRUE if a #GDrive can be stopped. Since 2.22.
- * @stop: Stops a #GDrive. Since 2.22.
- * @stop_finish: Finishes a stop operation. Since 2.22.
- * @can_start: Returns %TRUE if a #GDrive can be started. Since 2.22.
- * @can_start_degraded: Returns %TRUE if a #GDrive can be started degraded. Since 2.22.
- * @start: Starts a #GDrive. Since 2.22.
- * @start_finish: Finishes a start operation. Since 2.22.
- * @stop_button: Signal emitted when the physical stop button (if any) of a drive have been pressed. Since 2.22.
- * @eject_with_operation: Starts ejecting a #GDrive using a #GMountOperation. Since 2.22.
- * @eject_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @get_sort_key: Gets a key used for sorting #GDrive instances or %NULL if no such key exists. Since 2.32.
- * @get_symbolic_icon: Returns a symbolic #GIcon for the given #GDrive. Since 2.34.
- *
- * Interface for creating #GDrive implementations.
- */
-typedef struct _GDriveIface    GDriveIface;
-
-struct _GDriveIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-  void     (* changed)                  (GDrive              *drive);
-  void     (* disconnected)             (GDrive              *drive);
-  void     (* eject_button)             (GDrive              *drive);
-
-  /* Virtual Table */
-  char *   (* get_name)                 (GDrive              *drive);
-  GIcon *  (* get_icon)                 (GDrive              *drive);
-  gboolean (* has_volumes)              (GDrive              *drive);
-  GList *  (* get_volumes)              (GDrive              *drive);
-  gboolean (* is_media_removable)       (GDrive              *drive);
-  gboolean (* has_media)                (GDrive              *drive);
-  gboolean (* is_media_check_automatic) (GDrive              *drive);
-  gboolean (* can_eject)                (GDrive              *drive);
-  gboolean (* can_poll_for_media)       (GDrive              *drive);
-  void     (* eject)                    (GDrive              *drive,
-                                         GMountUnmountFlags   flags,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* eject_finish)             (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-  void     (* poll_for_media)           (GDrive              *drive,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* poll_for_media_finish)    (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-
-  char *   (* get_identifier)           (GDrive              *drive,
-                                         const char          *kind);
-  char **  (* enumerate_identifiers)    (GDrive              *drive);
-
-  GDriveStartStopType (* get_start_stop_type) (GDrive        *drive);
-
-  gboolean (* can_start)                (GDrive              *drive);
-  gboolean (* can_start_degraded)       (GDrive              *drive);
-  void     (* start)                    (GDrive              *drive,
-                                         GDriveStartFlags     flags,
-                                         GMountOperation     *mount_operation,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* start_finish)             (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-
-  gboolean (* can_stop)                 (GDrive              *drive);
-  void     (* stop)                     (GDrive              *drive,
-                                         GMountUnmountFlags   flags,
-                                         GMountOperation     *mount_operation,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* stop_finish)              (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-  /* signal, not VFunc */
-  void     (* stop_button)              (GDrive              *drive);
-
-  void        (* eject_with_operation)      (GDrive              *drive,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_with_operation_finish) (GDrive            *drive,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  const gchar * (* get_sort_key)        (GDrive              *drive);
-  GIcon *       (* get_symbolic_icon)   (GDrive              *drive);
-
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_drive_get_type                 (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-char *   g_drive_get_name                 (GDrive               *drive);
-GLIB_AVAILABLE_IN_ALL
-GIcon *  g_drive_get_icon                 (GDrive               *drive);
-GLIB_AVAILABLE_IN_ALL
-GIcon *  g_drive_get_symbolic_icon        (GDrive               *drive);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_has_volumes              (GDrive               *drive);
-GLIB_AVAILABLE_IN_ALL
-GList *  g_drive_get_volumes              (GDrive               *drive);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_is_media_removable       (GDrive               *drive);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_has_media                (GDrive               *drive);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_is_media_check_automatic (GDrive               *drive);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_can_poll_for_media       (GDrive               *drive);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_can_eject                (GDrive               *drive);
-GLIB_DEPRECATED_FOR(g_drive_eject_with_operation)
-void     g_drive_eject                    (GDrive               *drive,
-                                           GMountUnmountFlags    flags,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-
-GLIB_DEPRECATED_FOR(g_drive_eject_with_operation_finish)
-gboolean g_drive_eject_finish             (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_drive_poll_for_media           (GDrive               *drive,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_poll_for_media_finish    (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-GLIB_AVAILABLE_IN_ALL
-char *   g_drive_get_identifier           (GDrive              *drive,
-                                           const char          *kind);
-GLIB_AVAILABLE_IN_ALL
-char **  g_drive_enumerate_identifiers    (GDrive              *drive);
-
-GLIB_AVAILABLE_IN_ALL
-GDriveStartStopType g_drive_get_start_stop_type (GDrive        *drive);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_can_start                (GDrive              *drive);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_can_start_degraded       (GDrive              *drive);
-GLIB_AVAILABLE_IN_ALL
-void     g_drive_start                    (GDrive              *drive,
-                                           GDriveStartFlags     flags,
-                                           GMountOperation     *mount_operation,
-                                           GCancellable        *cancellable,
-                                           GAsyncReadyCallback  callback,
-                                           gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_start_finish             (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_can_stop                 (GDrive               *drive);
-GLIB_AVAILABLE_IN_ALL
-void     g_drive_stop                     (GDrive               *drive,
-                                           GMountUnmountFlags    flags,
-                                           GMountOperation      *mount_operation,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_drive_stop_finish              (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-void        g_drive_eject_with_operation      (GDrive              *drive,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_drive_eject_with_operation_finish (GDrive            *drive,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_2_32
-const gchar *g_drive_get_sort_key         (GDrive               *drive);
-
-G_END_DECLS
-
-#endif /* __G_DRIVE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gemblem.h b/linux-x86/include/glib-2.0/gio/gemblem.h
deleted file mode 100644
index d581abb..0000000
--- a/linux-x86/include/glib-2.0/gio/gemblem.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Clemens N. Buss <cebuzz@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __G_EMBLEM_H__
-#define __G_EMBLEM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gioenums.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_EMBLEM         (g_emblem_get_type ())
-#define G_EMBLEM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_EMBLEM, GEmblem))
-#define G_EMBLEM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_EMBLEM, GEmblemClass))
-#define G_IS_EMBLEM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_EMBLEM))
-#define G_IS_EMBLEM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_EMBLEM))
-#define G_EMBLEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_EMBLEM, GEmblemClass))
-
-/**
- * GEmblem:
- *
- * An object for Emblems
- */
-typedef struct _GEmblem        GEmblem;
-typedef struct _GEmblemClass   GEmblemClass;
-
-GLIB_AVAILABLE_IN_ALL
-GType          g_emblem_get_type        (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GEmblem       *g_emblem_new             (GIcon         *icon);
-GLIB_AVAILABLE_IN_ALL
-GEmblem       *g_emblem_new_with_origin (GIcon         *icon,
-                                         GEmblemOrigin  origin);
-GLIB_AVAILABLE_IN_ALL
-GIcon         *g_emblem_get_icon        (GEmblem       *emblem);
-GLIB_AVAILABLE_IN_ALL
-GEmblemOrigin  g_emblem_get_origin      (GEmblem       *emblem);
-
-G_END_DECLS
-
-#endif /* __G_EMBLEM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gemblemedicon.h b/linux-x86/include/glib-2.0/gio/gemblemedicon.h
deleted file mode 100644
index 714fe39..0000000
--- a/linux-x86/include/glib-2.0/gio/gemblemedicon.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Gio - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Matthias Clasen <mclasen@redhat.com>
- *         Clemens N. Buss <cebuzz@gmail.com>
- */
-
-#ifndef __G_EMBLEMED_ICON_H__
-#define __G_EMBLEMED_ICON_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gicon.h>
-#include <gio/gemblem.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_EMBLEMED_ICON         (g_emblemed_icon_get_type ())
-#define G_EMBLEMED_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_EMBLEMED_ICON, GEmblemedIcon))
-#define G_EMBLEMED_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_EMBLEMED_ICON, GEmblemedIconClass))
-#define G_IS_EMBLEMED_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_EMBLEMED_ICON))
-#define G_IS_EMBLEMED_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_EMBLEMED_ICON))
-#define G_EMBLEMED_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_EMBLEMED_ICON, GEmblemedIconClass))
-
-/**
- * GEmblemedIcon:
- *
- * An implementation of #GIcon for icons with emblems.
- **/
-typedef struct _GEmblemedIcon        GEmblemedIcon;
-typedef struct _GEmblemedIconClass   GEmblemedIconClass;
-typedef struct _GEmblemedIconPrivate GEmblemedIconPrivate;
-
-struct _GEmblemedIcon
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GEmblemedIconPrivate *priv;
-};
-
-struct _GEmblemedIconClass
-{
-  GObjectClass parent_class;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType  g_emblemed_icon_get_type    (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GIcon *g_emblemed_icon_new         (GIcon         *icon,
-                                    GEmblem       *emblem);
-GLIB_AVAILABLE_IN_ALL
-GIcon *g_emblemed_icon_get_icon    (GEmblemedIcon *emblemed);
-GLIB_AVAILABLE_IN_ALL
-GList *g_emblemed_icon_get_emblems (GEmblemedIcon *emblemed);
-GLIB_AVAILABLE_IN_ALL
-void   g_emblemed_icon_add_emblem  (GEmblemedIcon *emblemed,
-                                    GEmblem       *emblem);
-GLIB_AVAILABLE_IN_ALL
-void   g_emblemed_icon_clear_emblems  (GEmblemedIcon *emblemed);
-
-G_END_DECLS
-
-#endif /* __G_EMBLEMED_ICON_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfile.h b/linux-x86/include/glib-2.0/gio/gfile.h
deleted file mode 100644
index 394c643..0000000
--- a/linux-x86/include/glib-2.0/gio/gfile.h
+++ /dev/null
@@ -1,1243 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_FILE_H__
-#define __G_FILE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE            (g_file_get_type ())
-#define G_FILE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_FILE, GFile))
-#define G_IS_FILE(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_FILE))
-#define G_FILE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_FILE, GFileIface))
-
-#if 0
-/**
- * GFile:
- *
- * A handle to an object implementing the #GFileIface interface.
- * Generally stores a location within the file system. Handles do not
- * necessarily represent files or directories that currently exist.
- **/
-typedef struct _GFile         		GFile; /* Dummy typedef */
-#endif
-typedef struct _GFileIface    		GFileIface;
-
-
-/**
- * GFileIface:
- * @g_iface: The parent interface.
- * @dup: Duplicates a #GFile.
- * @hash: Creates a hash of a #GFile.
- * @equal: Checks equality of two given #GFile<!-- -->s.
- * @is_native: Checks to see if a file is native to the system.
- * @has_uri_scheme: Checks to see if a #GFile has a given URI scheme.
- * @get_uri_scheme: Gets the URI scheme for a #GFile.
- * @get_basename: Gets the basename for a given #GFile.
- * @get_path: Gets the current path within a #GFile.
- * @get_uri: Gets a URI for the path within a #GFile.
- * @get_parse_name: Gets the parsed name for the #GFile.
- * @get_parent: Gets the parent directory for the #GFile.
- * @prefix_matches: Checks whether a #GFile contains a specified file.
- * @get_relative_path: Gets the path for a #GFile relative to a given path.
- * @resolve_relative_path: Resolves a relative path for a #GFile to an absolute path.
- * @get_child_for_display_name: Gets the child #GFile for a given display name.
- * @enumerate_children: Gets a #GFileEnumerator with the children of a #GFile.
- * @enumerate_children_async: Asynchronously gets a #GFileEnumerator with the children of a #GFile.
- * @enumerate_children_finish: Finishes asynchronously enumerating the children.
- * @query_info: Gets the #GFileInfo for a #GFile.
- * @query_info_async: Asynchronously gets the #GFileInfo for a #GFile.
- * @query_info_finish: Finishes an asynchronous query info operation.
- * @query_filesystem_info: Gets a #GFileInfo for the file system #GFile is on.
- * @query_filesystem_info_async: Asynchronously gets a #GFileInfo for the file system #GFile is on.
- * @query_filesystem_info_finish: Finishes asynchronously getting the file system info.
- * @find_enclosing_mount: Gets a #GMount for the #GFile.
- * @find_enclosing_mount_async: Asynchronously gets the #GMount for a #GFile.
- * @find_enclosing_mount_finish: Finishes asynchronously getting the volume.
- * @set_display_name: Sets the display name for a #GFile.
- * @set_display_name_async: Asynchronously sets a #GFile's display name.
- * @set_display_name_finish: Finishes asynchronously setting a #GFile's display name.
- * @query_settable_attributes: Returns a list of #GFileAttribute<!-- -->s that can be set.
- * @_query_settable_attributes_async: Asynchronously gets a list of #GFileAttribute<!-- -->s that can be set.
- * @_query_settable_attributes_finish: Finishes asynchronously querying settable attributes.
- * @query_writable_namespaces: Returns a list of #GFileAttribute namespaces that are writable.
- * @_query_writable_namespaces_async: Asynchronously gets a list of #GFileAttribute namespaces that are writable.
- * @_query_writable_namespaces_finish: Finishes asynchronously querying the writable namespaces.
- * @set_attribute: Sets a #GFileAttribute.
- * @set_attributes_from_info: Sets a #GFileAttribute with information from a #GFileInfo.
- * @set_attributes_async: Asynchronously sets a file's attributes.
- * @set_attributes_finish: Finishes setting a file's attributes asynchronously.
- * @read_fn: Reads a file asynchronously.
- * @read_async: Asynchronously reads a file.
- * @read_finish: Finishes asynchronously reading a file.
- * @append_to: Writes to the end of a file.
- * @append_to_async: Asynchronously writes to the end of a file.
- * @append_to_finish: Finishes an asynchronous file append operation.
- * @create: Creates a new file.
- * @create_async: Asynchronously creates a file.
- * @create_finish: Finishes asynchronously creating a file.
- * @replace: Replaces the contents of a file.
- * @replace_async: Asynchronously replaces the contents of a file.
- * @replace_finish: Finishes asynchronously replacing a file.
- * @delete_file: Deletes a file.
- * @delete_file_async: Asynchronously deletes a file.
- * @delete_file_finish: Finishes an asynchronous delete.
- * @trash: Sends a #GFile to the Trash location.
- * @trash_async: Asynchronously sends a #GFile to the Trash location.
- * @trash_finish: Finishes an asynchronous file trashing operation.
- * @make_directory: Makes a directory.
- * @make_directory_async: Asynchronously makes a directory.
- * @make_directory_finish: Finishes making a directory asynchronously.
- * @make_symbolic_link: Makes a symbolic link.
- * @_make_symbolic_link_async: Asynchronously makes a symbolic link
- * @_make_symbolic_link_finish: Finishes making a symbolic link asynchronously.
- * @copy: Copies a file.
- * @copy_async: Asynchronously copies a file.
- * @copy_finish: Finishes an asynchronous copy operation.
- * @move: Moves a file.
- * @_move_async: Asynchronously moves a file.
- * @_move_finish: Finishes an asynchronous move operation.
- * @mount_mountable: Mounts a mountable object.
- * @mount_mountable_finish: Finishes a mounting operation.
- * @unmount_mountable: Unmounts a mountable object.
- * @unmount_mountable_finish: Finishes an unmount operation.
- * @eject_mountable: Ejects a mountable.
- * @eject_mountable_finish: Finishes an eject operation.
- * @mount_enclosing_volume: Mounts a specified location.
- * @mount_enclosing_volume_finish: Finishes mounting a specified location.
- * @monitor_dir: Creates a #GFileMonitor for the location.
- * @monitor_file: Creates a #GFileMonitor for the location.
- * @open_readwrite: Open file read/write. Since 2.22.
- * @open_readwrite_async: Asynchronously opens file read/write. Since 2.22.
- * @open_readwrite_finish: Finishes an asynchronous open read/write. Since 2.22.
- * @create_readwrite: Creates file read/write. Since 2.22.
- * @create_readwrite_async: Asynchronously creates file read/write. Since 2.22.
- * @create_readwrite_finish: Finishes an asynchronous creates read/write. Since 2.22.
- * @replace_readwrite: Replaces file read/write. Since 2.22.
- * @replace_readwrite_async: Asynchronously replaces file read/write. Since 2.22.
- * @replace_readwrite_finish: Finishes an asynchronous replace read/write. Since 2.22.
- * @start_mountable: Starts a mountable object. Since 2.22.
- * @start_mountable_finish: Finishes an start operation. Since 2.22.
- * @stop_mountable: Stops a mountable. Since 2.22.
- * @stop_mountable_finish: Finishes an stop operation. Since 2.22.
- * @supports_thread_contexts: a boolean that indicates whether the #GFile implementation supports thread-default contexts. Since 2.22.
- * @unmount_mountable_with_operation: Unmounts a mountable object using a #GMountOperation. Since 2.22.
- * @unmount_mountable_with_operation_finish: Finishes an unmount operation using a #GMountOperation. Since 2.22.
- * @eject_mountable_with_operation: Ejects a mountable object using a #GMountOperation. Since 2.22.
- * @eject_mountable_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @poll_mountable: Polls a mountable object for media changes. Since 2.22.
- * @poll_mountable_finish: Finishes an poll operation for media changes. Since 2.22.
- *
- * An interface for writing VFS file handles.
- **/
-struct _GFileIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GFile *             (* dup)                         (GFile         *file);
-  guint               (* hash)                        (GFile         *file);
-  gboolean            (* equal)                       (GFile         *file1,
-                                                       GFile         *file2);
-  gboolean            (* is_native)                   (GFile         *file);
-  gboolean            (* has_uri_scheme)              (GFile         *file,
-                                                       const char    *uri_scheme);
-  char *              (* get_uri_scheme)              (GFile         *file);
-  char *              (* get_basename)                (GFile         *file);
-  char *              (* get_path)                    (GFile         *file);
-  char *              (* get_uri)                     (GFile         *file);
-  char *              (* get_parse_name)              (GFile         *file);
-  GFile *             (* get_parent)                  (GFile         *file);
-  gboolean            (* prefix_matches)              (GFile         *prefix,
-                                                       GFile         *file);
-  char *              (* get_relative_path)           (GFile         *parent,
-                                                       GFile         *descendant);
-  GFile *             (* resolve_relative_path)       (GFile        *file,
-                                                       const char   *relative_path);
-  GFile *             (* get_child_for_display_name)  (GFile        *file,
-                                                       const char   *display_name,
-                                                       GError      **error);
-
-  GFileEnumerator *   (* enumerate_children)          (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* enumerate_children_async)    (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileEnumerator *   (* enumerate_children_finish)   (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileInfo *         (* query_info)                  (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* query_info_async)            (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileInfo *         (* query_info_finish)           (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileInfo *         (* query_filesystem_info)       (GFile                *file,
-                                                       const char           *attributes,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* query_filesystem_info_async) (GFile                *file,
-                                                       const char           *attributes,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileInfo *         (* query_filesystem_info_finish)(GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GMount *            (* find_enclosing_mount)        (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* find_enclosing_mount_async)  (GFile                *file,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GMount *            (* find_enclosing_mount_finish) (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFile *             (* set_display_name)            (GFile                *file,
-                                                       const char           *display_name,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* set_display_name_async)      (GFile                *file,
-                                                       const char           *display_name,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFile *             (* set_display_name_finish)     (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileAttributeInfoList * (* query_settable_attributes)    (GFile          *file,
-                                                             GCancellable   *cancellable,
-                                                             GError        **error);
-  void                (* _query_settable_attributes_async)  (void);
-  void                (* _query_settable_attributes_finish) (void);
-
-  GFileAttributeInfoList * (* query_writable_namespaces)    (GFile          *file,
-                                                             GCancellable   *cancellable,
-                                                             GError        **error);
-  void                (* _query_writable_namespaces_async)  (void);
-  void                (* _query_writable_namespaces_finish) (void);
-
-  gboolean            (* set_attribute)               (GFile                *file,
-                                                       const char           *attribute,
-                                                       GFileAttributeType    type,
-                                                       gpointer              value_p,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  gboolean            (* set_attributes_from_info)    (GFile                *file,
-                                                       GFileInfo            *info,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* set_attributes_async)        (GFile                *file,
-                                                       GFileInfo            *info,
-                                                       GFileQueryInfoFlags   flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* set_attributes_finish)       (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GFileInfo           **info,
-                                                       GError              **error);
-
-  GFileInputStream *  (* read_fn)                     (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* read_async)                  (GFile                *file,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileInputStream *  (* read_finish)                 (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileOutputStream * (* append_to)                   (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* append_to_async)             (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileOutputStream * (* append_to_finish)            (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileOutputStream * (* create)                      (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* create_async)                (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileOutputStream * (* create_finish)               (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileOutputStream * (* replace)                     (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* replace_async)               (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileOutputStream * (* replace_finish)              (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  gboolean            (* delete_file)                 (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* delete_file_async)           (GFile                *file,
-						       int                   io_priority,
-						       GCancellable         *cancellable,
-						       GAsyncReadyCallback   callback,
-						       gpointer              user_data);
-  gboolean            (* delete_file_finish)          (GFile                *file,
-						       GAsyncResult         *result,
-						       GError              **error);
-
-  gboolean            (* trash)                       (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* trash_async)                 (GFile                *file,
-						       int                   io_priority,
-						       GCancellable         *cancellable,
-						       GAsyncReadyCallback   callback,
-						       gpointer              user_data);
-  gboolean            (* trash_finish)                (GFile                *file,
-						       GAsyncResult         *result,
-						       GError              **error);
-
-  gboolean            (* make_directory)              (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* make_directory_async)        (GFile                *file,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* make_directory_finish)       (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  gboolean            (* make_symbolic_link)          (GFile                *file,
-                                                       const char           *symlink_value,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* _make_symbolic_link_async)   (void);
-  void                (* _make_symbolic_link_finish)  (void);
-
-  gboolean            (* copy)                        (GFile                *source,
-                                                       GFile                *destination,
-                                                       GFileCopyFlags        flags,
-                                                       GCancellable         *cancellable,
-                                                       GFileProgressCallback progress_callback,
-                                                       gpointer              progress_callback_data,
-                                                       GError              **error);
-  void                (* copy_async)                  (GFile                *source,
-                                                       GFile                *destination,
-                                                       GFileCopyFlags        flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GFileProgressCallback progress_callback,
-                                                       gpointer              progress_callback_data,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* copy_finish)                 (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  gboolean            (* move)                        (GFile                *source,
-                                                       GFile                *destination,
-                                                       GFileCopyFlags        flags,
-                                                       GCancellable         *cancellable,
-                                                       GFileProgressCallback progress_callback,
-                                                       gpointer              progress_callback_data,
-                                                       GError              **error);
-  void                (* _move_async)                 (void);
-  void                (* _move_finish)                (void);
-
-  void                (* mount_mountable)             (GFile                *file,
-                                                       GMountMountFlags      flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFile *             (* mount_mountable_finish)      (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* unmount_mountable)           (GFile                *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* unmount_mountable_finish)    (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* eject_mountable)             (GFile                *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* eject_mountable_finish)      (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* mount_enclosing_volume)      (GFile                *location,
-                                                       GMountMountFlags      flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean         (* mount_enclosing_volume_finish)  (GFile                *location,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  GFileMonitor *      (* monitor_dir)                 (GFile                *file,
-                                                       GFileMonitorFlags     flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  GFileMonitor *      (* monitor_file)                (GFile                *file,
-                                                       GFileMonitorFlags     flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-
-  GFileIOStream *     (* open_readwrite)              (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* open_readwrite_async)        (GFile                *file,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileIOStream *     (* open_readwrite_finish)       (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-  GFileIOStream *     (* create_readwrite)            (GFile                *file,
-						       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* create_readwrite_async)      (GFile                *file,
-						       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileIOStream *     (* create_readwrite_finish)      (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-  GFileIOStream *     (* replace_readwrite)           (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* replace_readwrite_async)     (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileIOStream *     (* replace_readwrite_finish)    (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  void                (* start_mountable)             (GFile                *file,
-                                                       GDriveStartFlags      flags,
-                                                       GMountOperation      *start_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* start_mountable_finish)      (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* stop_mountable)              (GFile                *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* stop_mountable_finish)       (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  gboolean            supports_thread_contexts;
-
-  void                (* unmount_mountable_with_operation) (GFile           *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* unmount_mountable_with_operation_finish) (GFile    *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* eject_mountable_with_operation) (GFile             *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* eject_mountable_with_operation_finish) (GFile      *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* poll_mountable)              (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* poll_mountable_finish)       (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  gboolean            (* measure_disk_usage)          (GFile                         *file,
-                                                       GFileMeasureFlags              flags,
-                                                       GCancellable                  *cancellable,
-                                                       GFileMeasureProgressCallback   progress_callback,
-                                                       gpointer                       progress_data,
-                                                       guint64                       *disk_usage,
-                                                       guint64                       *num_dirs,
-                                                       guint64                       *num_files,
-                                                       GError                       **error);
-  void                (* measure_disk_usage_async)    (GFile                         *file,
-                                                       GFileMeasureFlags              flags,
-                                                       gint                           io_priority,
-                                                       GCancellable                  *cancellable,
-                                                       GFileMeasureProgressCallback   progress_callback,
-                                                       gpointer                       progress_data,
-                                                       GAsyncReadyCallback            callback,
-                                                       gpointer                       user_data);
-  gboolean            (* measure_disk_usage_finish)   (GFile                         *file,
-                                                       GAsyncResult                  *result,
-                                                       guint64                       *disk_usage,
-                                                       guint64                       *num_dirs,
-                                                       guint64                       *num_files,
-                                                       GError                       **error);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_file_get_type                   (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_new_for_path               (const char                 *path);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_new_for_uri                (const char                 *uri);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_new_for_commandline_arg    (const char                 *arg);
-GLIB_AVAILABLE_IN_2_36
-GFile *                 g_file_new_for_commandline_arg_and_cwd (const gchar           *arg,
-                                                                const gchar           *cwd);
-GLIB_AVAILABLE_IN_2_32
-GFile *                 g_file_new_tmp                    (const char                 *tmpl,
-                                                           GFileIOStream             **iostream,
-                                                           GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_parse_name                 (const char                 *parse_name);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_dup                        (GFile                      *file);
-GLIB_AVAILABLE_IN_ALL
-guint                   g_file_hash                       (gconstpointer               file);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_equal                      (GFile                      *file1,
-							   GFile                      *file2);
-GLIB_AVAILABLE_IN_ALL
-char *                  g_file_get_basename               (GFile                      *file);
-GLIB_AVAILABLE_IN_ALL
-char *                  g_file_get_path                   (GFile                      *file);
-GLIB_AVAILABLE_IN_ALL
-char *                  g_file_get_uri                    (GFile                      *file);
-GLIB_AVAILABLE_IN_ALL
-char *                  g_file_get_parse_name             (GFile                      *file);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_get_parent                 (GFile                      *file);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_has_parent                 (GFile                      *file,
-                                                           GFile                      *parent);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_get_child                  (GFile                      *file,
-							   const char                 *name);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_get_child_for_display_name (GFile                      *file,
-							   const char                 *display_name,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_has_prefix                 (GFile                      *file,
-							   GFile                      *prefix);
-GLIB_AVAILABLE_IN_ALL
-char *                  g_file_get_relative_path          (GFile                      *parent,
-							   GFile                      *descendant);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_resolve_relative_path      (GFile                      *file,
-							   const char                 *relative_path);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_is_native                  (GFile                      *file);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_has_uri_scheme             (GFile                      *file,
-							   const char                 *uri_scheme);
-GLIB_AVAILABLE_IN_ALL
-char *                  g_file_get_uri_scheme             (GFile                      *file);
-GLIB_AVAILABLE_IN_ALL
-GFileInputStream *      g_file_read                       (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_read_async                 (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileInputStream *      g_file_read_finish                (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFileOutputStream *     g_file_append_to                  (GFile                      *file,
-							   GFileCreateFlags             flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFileOutputStream *     g_file_create                     (GFile                      *file,
-							   GFileCreateFlags             flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFileOutputStream *     g_file_replace                    (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_append_to_async            (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileOutputStream *     g_file_append_to_finish           (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_create_async               (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileOutputStream *     g_file_create_finish              (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_replace_async              (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileOutputStream *     g_file_replace_finish             (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFileIOStream *         g_file_open_readwrite             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_open_readwrite_async       (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileIOStream *         g_file_open_readwrite_finish      (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFileIOStream *         g_file_create_readwrite           (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_create_readwrite_async     (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileIOStream *         g_file_create_readwrite_finish    (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFileIOStream *         g_file_replace_readwrite          (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_replace_readwrite_async    (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileIOStream *         g_file_replace_readwrite_finish   (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_query_exists               (GFile                      *file,
-							   GCancellable               *cancellable);
-GLIB_AVAILABLE_IN_ALL
-GFileType               g_file_query_file_type            (GFile                      *file,
-                                                           GFileQueryInfoFlags         flags,
-                                                           GCancellable               *cancellable);
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *             g_file_query_info                 (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_query_info_async           (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *             g_file_query_info_finish          (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *             g_file_query_filesystem_info      (GFile                      *file,
-							   const char                 *attributes,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_query_filesystem_info_async (GFile                      *file,
-							   const char                 *attributes,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *             g_file_query_filesystem_info_finish (GFile                      *file,
-                                                           GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GMount *                g_file_find_enclosing_mount       (GFile                      *file,
-                                                           GCancellable               *cancellable,
-                                                           GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_find_enclosing_mount_async (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GMount *                g_file_find_enclosing_mount_finish (GFile                     *file,
-							    GAsyncResult              *res,
-							    GError                   **error);
-GLIB_AVAILABLE_IN_ALL
-GFileEnumerator *       g_file_enumerate_children         (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_enumerate_children_async   (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileEnumerator *       g_file_enumerate_children_finish  (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_set_display_name           (GFile                      *file,
-							   const char                 *display_name,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_set_display_name_async     (GFile                      *file,
-							   const char                 *display_name,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_set_display_name_finish    (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_delete                     (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-
-GLIB_AVAILABLE_IN_2_34
-void                    g_file_delete_async               (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean                g_file_delete_finish              (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_trash                      (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-
-GLIB_AVAILABLE_IN_2_38
-void                    g_file_trash_async                (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-
-GLIB_AVAILABLE_IN_2_38
-gboolean                g_file_trash_finish               (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_copy                       (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_copy_async                 (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_copy_finish                (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_move                       (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_make_directory             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_2_38
-void                    g_file_make_directory_async       (GFile                      *file,
-                                                           int                         io_priority,
-                                                           GCancellable               *cancellable,
-                                                           GAsyncReadyCallback         callback,
-                                                           gpointer                    user_data);
-GLIB_AVAILABLE_IN_2_38
-gboolean                g_file_make_directory_finish      (GFile                      *file,
-                                                           GAsyncResult               *result,
-                                                           GError                    **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_make_directory_with_parents (GFile                     *file,
-		                                           GCancellable               *cancellable,
-		                                           GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_make_symbolic_link         (GFile                      *file,
-							   const char                 *symlink_value,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFileAttributeInfoList *g_file_query_settable_attributes  (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-GFileAttributeInfoList *g_file_query_writable_namespaces  (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_set_attribute              (GFile                      *file,
-							   const char                 *attribute,
-							   GFileAttributeType          type,
-							   gpointer                    value_p,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_set_attributes_from_info   (GFile                      *file,
-							   GFileInfo                  *info,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_set_attributes_async       (GFile                      *file,
-							   GFileInfo                  *info,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_set_attributes_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GFileInfo                 **info,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_set_attribute_string       (GFile                      *file,
-							   const char                 *attribute,
-							   const char                 *value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_set_attribute_byte_string  (GFile                      *file,
-							   const char                 *attribute,
-							   const char                 *value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_set_attribute_uint32       (GFile                      *file,
-							   const char                 *attribute,
-							   guint32                     value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_set_attribute_int32        (GFile                      *file,
-							   const char                 *attribute,
-							   gint32                      value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_set_attribute_uint64       (GFile                      *file,
-							   const char                 *attribute,
-							   guint64                     value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_set_attribute_int64        (GFile                      *file,
-							   const char                 *attribute,
-							   gint64                      value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_mount_enclosing_volume     (GFile                      *location,
-							   GMountMountFlags            flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_mount_enclosing_volume_finish (GFile                      *location,
-							   GAsyncResult               *result,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_mount_mountable            (GFile                      *file,
-							   GMountMountFlags            flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-GFile *                 g_file_mount_mountable_finish     (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation)
-void                    g_file_unmount_mountable          (GFile                      *file,
-                                                           GMountUnmountFlags          flags,
-                                                           GCancellable               *cancellable,
-                                                           GAsyncReadyCallback         callback,
-                                                           gpointer                    user_data);
-
-GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish)
-gboolean                g_file_unmount_mountable_finish   (GFile                      *file,
-                                                           GAsyncResult               *result,
-                                                           GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_unmount_mountable_with_operation (GFile                *file,
-							   GMountUnmountFlags          flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_unmount_mountable_with_operation_finish (GFile         *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation)
-void                    g_file_eject_mountable            (GFile                      *file,
-                                                           GMountUnmountFlags          flags,
-                                                           GCancellable               *cancellable,
-                                                           GAsyncReadyCallback         callback,
-                                                           gpointer                    user_data);
-
-GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish)
-gboolean                g_file_eject_mountable_finish     (GFile                      *file,
-                                                           GAsyncResult               *result,
-                                                           GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_eject_mountable_with_operation (GFile                  *file,
-							   GMountUnmountFlags          flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_eject_mountable_with_operation_finish (GFile           *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_copy_attributes            (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-
-
-GLIB_AVAILABLE_IN_ALL
-GFileMonitor*           g_file_monitor_directory          (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-GLIB_AVAILABLE_IN_ALL
-GFileMonitor*           g_file_monitor_file               (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-GLIB_AVAILABLE_IN_ALL
-GFileMonitor*           g_file_monitor                    (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-
-GLIB_AVAILABLE_IN_2_38
-gboolean                g_file_measure_disk_usage         (GFile                         *file,
-                                                           GFileMeasureFlags              flags,
-                                                           GCancellable                  *cancellable,
-                                                           GFileMeasureProgressCallback   progress_callback,
-                                                           gpointer                       progress_data,
-                                                           guint64                       *disk_usage,
-                                                           guint64                       *num_dirs,
-                                                           guint64                       *num_files,
-                                                           GError                       **error);
-
-GLIB_AVAILABLE_IN_2_38
-void                    g_file_measure_disk_usage_async   (GFile                         *file,
-                                                           GFileMeasureFlags              flags,
-                                                           gint                           io_priority,
-                                                           GCancellable                  *cancellable,
-                                                           GFileMeasureProgressCallback   progress_callback,
-                                                           gpointer                       progress_data,
-                                                           GAsyncReadyCallback            callback,
-                                                           gpointer                       user_data);
-
-GLIB_AVAILABLE_IN_2_38
-gboolean                g_file_measure_disk_usage_finish  (GFile                         *file,
-                                                           GAsyncResult                  *result,
-                                                           guint64                       *disk_usage,
-                                                           guint64                       *num_dirs,
-                                                           guint64                       *num_files,
-                                                           GError                       **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_start_mountable            (GFile                      *file,
-							   GDriveStartFlags            flags,
-							   GMountOperation            *start_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_start_mountable_finish     (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_stop_mountable             (GFile                      *file,
-							   GMountUnmountFlags          flags,
-                                                           GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_stop_mountable_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_file_poll_mountable             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_file_poll_mountable_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-/* Utilities */
-
-GLIB_AVAILABLE_IN_ALL
-GAppInfo *g_file_query_default_handler       (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GError                **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_load_contents                (GFile                  *file,
-					      GCancellable           *cancellable,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_file_load_contents_async          (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_load_contents_finish         (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_file_load_partial_contents_async  (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GFileReadMoreCallback   read_more_callback,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_load_partial_contents_finish (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_replace_contents             (GFile                  *file,
-					      const char             *contents,
-					      gsize                   length,
-					      const char             *etag,
-					      gboolean                make_backup,
-					      GFileCreateFlags        flags,
-					      char                  **new_etag,
-					      GCancellable           *cancellable,
-					      GError                **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_file_replace_contents_async       (GFile                  *file,
-					      const char             *contents,
-					      gsize                   length,
-					      const char             *etag,
-					      gboolean                make_backup,
-					      GFileCreateFlags        flags,
-					      GCancellable           *cancellable,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_replace_contents_finish      (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **new_etag,
-					      GError                **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_supports_thread_contexts     (GFile                  *file);
-
-G_END_DECLS
-
-#endif /* __G_FILE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfileattribute.h b/linux-x86/include/glib-2.0/gio/gfileattribute.h
deleted file mode 100644
index 8ebdcd4..0000000
--- a/linux-x86/include/glib-2.0/gio/gfileattribute.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_FILE_ATTRIBUTE_H__
-#define __G_FILE_ATTRIBUTE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GFileAttributeInfo:
- * @name: the name of the attribute.
- * @type: the #GFileAttributeType type of the attribute.
- * @flags: a set of #GFileAttributeInfoFlags.
- *
- * Information about a specific attribute.
- **/
-struct _GFileAttributeInfo
-{
-  char                    *name;
-  GFileAttributeType       type;
-  GFileAttributeInfoFlags  flags;
-};
-
-/**
- * GFileAttributeInfoList:
- * @infos: an array of #GFileAttributeInfo<!-- -->s.
- * @n_infos: the number of values in the array.
- *
- * Acts as a lightweight registry for possible valid file attributes.
- * The registry stores Key-Value pair formats as #GFileAttributeInfo<!-- -->s.
- **/
-struct _GFileAttributeInfoList
-{
-  GFileAttributeInfo *infos;
-  int                 n_infos;
-};
-
-#define G_TYPE_FILE_ATTRIBUTE_INFO_LIST (g_file_attribute_info_list_get_type ())
-GLIB_AVAILABLE_IN_ALL
-GType g_file_attribute_info_list_get_type (void);
-
-GLIB_AVAILABLE_IN_ALL
-GFileAttributeInfoList *  g_file_attribute_info_list_new    (void);
-GLIB_AVAILABLE_IN_ALL
-GFileAttributeInfoList *  g_file_attribute_info_list_ref    (GFileAttributeInfoList *list);
-GLIB_AVAILABLE_IN_ALL
-void                      g_file_attribute_info_list_unref  (GFileAttributeInfoList *list);
-GLIB_AVAILABLE_IN_ALL
-GFileAttributeInfoList *  g_file_attribute_info_list_dup    (GFileAttributeInfoList *list);
-GLIB_AVAILABLE_IN_ALL
-const GFileAttributeInfo *g_file_attribute_info_list_lookup (GFileAttributeInfoList *list,
-							     const char             *name);
-GLIB_AVAILABLE_IN_ALL
-void                      g_file_attribute_info_list_add    (GFileAttributeInfoList *list,
-							     const char             *name,
-							     GFileAttributeType      type,
-							     GFileAttributeInfoFlags flags);
-
-G_END_DECLS
-
-#endif /* __G_FILE_INFO_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfileenumerator.h b/linux-x86/include/glib-2.0/gio/gfileenumerator.h
deleted file mode 100644
index 7607002..0000000
--- a/linux-x86/include/glib-2.0/gio/gfileenumerator.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_FILE_ENUMERATOR_H__
-#define __G_FILE_ENUMERATOR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_ENUMERATOR         (g_file_enumerator_get_type ())
-#define G_FILE_ENUMERATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_ENUMERATOR, GFileEnumerator))
-#define G_FILE_ENUMERATOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_ENUMERATOR, GFileEnumeratorClass))
-#define G_IS_FILE_ENUMERATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_ENUMERATOR))
-#define G_IS_FILE_ENUMERATOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_ENUMERATOR))
-#define G_FILE_ENUMERATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_ENUMERATOR, GFileEnumeratorClass))
-
-/**
- * GFileEnumerator:
- *
- * A per matched file iterator.
- **/
-typedef struct _GFileEnumeratorClass    GFileEnumeratorClass;
-typedef struct _GFileEnumeratorPrivate  GFileEnumeratorPrivate;
-
-struct _GFileEnumerator
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GFileEnumeratorPrivate *priv;
-};
-
-struct _GFileEnumeratorClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Table */
-
-  GFileInfo * (* next_file)         (GFileEnumerator      *enumerator,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  gboolean    (* close_fn)          (GFileEnumerator      *enumerator,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-
-  void        (* next_files_async)  (GFileEnumerator      *enumerator,
-                                     int                   num_files,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GList *     (* next_files_finish) (GFileEnumerator      *enumerator,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-  void        (* close_async)       (GFileEnumerator      *enumerator,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  gboolean    (* close_finish)      (GFileEnumerator      *enumerator,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType      g_file_enumerator_get_type          (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *g_file_enumerator_next_file         (GFileEnumerator      *enumerator,
-						GCancellable         *cancellable,
-						GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean   g_file_enumerator_close             (GFileEnumerator      *enumerator,
-						GCancellable         *cancellable,
-						GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void       g_file_enumerator_next_files_async  (GFileEnumerator      *enumerator,
-						int                   num_files,
-						int                   io_priority,
-						GCancellable         *cancellable,
-						GAsyncReadyCallback   callback,
-						gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GList *    g_file_enumerator_next_files_finish (GFileEnumerator      *enumerator,
-						GAsyncResult         *result,
-						GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void       g_file_enumerator_close_async       (GFileEnumerator      *enumerator,
-						int                   io_priority,
-						GCancellable         *cancellable,
-						GAsyncReadyCallback   callback,
-						gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean   g_file_enumerator_close_finish      (GFileEnumerator      *enumerator,
-						GAsyncResult         *result,
-						GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean   g_file_enumerator_is_closed         (GFileEnumerator      *enumerator);
-GLIB_AVAILABLE_IN_ALL
-gboolean   g_file_enumerator_has_pending       (GFileEnumerator      *enumerator);
-GLIB_AVAILABLE_IN_ALL
-void       g_file_enumerator_set_pending       (GFileEnumerator      *enumerator,
-						gboolean              pending);
-GLIB_AVAILABLE_IN_ALL
-GFile *    g_file_enumerator_get_container     (GFileEnumerator *enumerator);
-GLIB_AVAILABLE_IN_2_36
-GFile *    g_file_enumerator_get_child         (GFileEnumerator *enumerator,
-                                                GFileInfo       *info);
-
-G_END_DECLS
-
-#endif /* __G_FILE_ENUMERATOR_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfileicon.h b/linux-x86/include/glib-2.0/gio/gfileicon.h
deleted file mode 100644
index 2e6f3d5..0000000
--- a/linux-x86/include/glib-2.0/gio/gfileicon.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_FILE_ICON_H__
-#define __G_FILE_ICON_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_ICON         (g_file_icon_get_type ())
-#define G_FILE_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_ICON, GFileIcon))
-#define G_FILE_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_ICON, GFileIconClass))
-#define G_IS_FILE_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_ICON))
-#define G_IS_FILE_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_ICON))
-#define G_FILE_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_ICON, GFileIconClass))
-
-/**
- * GFileIcon:
- *
- * Gets an icon for a #GFile. Implements #GLoadableIcon.
- **/
-typedef struct _GFileIconClass   GFileIconClass;
-
-GLIB_AVAILABLE_IN_ALL
-GType   g_file_icon_get_type (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GIcon * g_file_icon_new      (GFile     *file);
-
-GLIB_AVAILABLE_IN_ALL
-GFile * g_file_icon_get_file (GFileIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_FILE_ICON_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfileinfo.h b/linux-x86/include/glib-2.0/gio/gfileinfo.h
deleted file mode 100644
index a001b0d..0000000
--- a/linux-x86/include/glib-2.0/gio/gfileinfo.h
+++ /dev/null
@@ -1,1057 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_FILE_INFO_H__
-#define __G_FILE_INFO_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_INFO         (g_file_info_get_type ())
-#define G_FILE_INFO(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_INFO, GFileInfo))
-#define G_FILE_INFO_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_INFO, GFileInfoClass))
-#define G_IS_FILE_INFO(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_INFO))
-#define G_IS_FILE_INFO_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_INFO))
-#define G_FILE_INFO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_INFO, GFileInfoClass))
-
-/**
- * GFileInfo:
- *
- * Stores information about a file system object referenced by a #GFile.
- **/
-typedef struct _GFileInfoClass   GFileInfoClass;
-
-
-/* Common Attributes:  */
-/**
- * G_FILE_ATTRIBUTE_STANDARD_TYPE:
- *
- * A key in the "standard" namespace for storing file types.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- * The value for this key should contain a #GFileType.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_TYPE "standard::type"                     /* uint32 (GFileType) */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN:
- *
- * A key in the "standard" namespace for checking if a file is hidden.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN "standard::is-hidden"           /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP:
- *
- * A key in the "standard" namespace for checking if a file is a backup file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP "standard::is-backup"           /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK:
- *
- * A key in the "standard" namespace for checking if the file is a symlink.
- * Typically the actual type is something else, if we followed the symlink
- * to get the type.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK "standard::is-symlink"         /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL:
- *
- * A key in the "standard" namespace for checking if a file is virtual.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL "standard::is-virtual"         /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_NAME:
- *
- * A key in the "standard" namespace for getting the name of the file.
- * The name is the on-disk filename which may not be in any known encoding,
- * and can thus not be generally displayed as is.
- * Use #G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME if you need to display the
- * name in a user interface.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_NAME "standard::name"                     /* byte string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME:
- *
- * A key in the "standard" namespace for getting the display name of the file.
- * A display name is guaranteed to be in UTF8 and can thus be displayed in
- * the UI.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME "standard::display-name"     /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME:
- *
- * A key in the "standard" namespace for edit name of the file.
- * An edit name is similar to the display name, but it is meant to be
- * used when you want to rename the file in the UI. The display name
- * might contain information you don't want in the new filename (such as
- * "(invalid unicode)" if the filename was in an invalid encoding).
- *
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME "standard::edit-name"           /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_COPY_NAME:
- *
- * A key in the "standard" namespace for getting the copy name of the file.
- * The copy name is an optional version of the name. If available it's always
- * in UTF8, and corresponds directly to the original filename (only transcoded to
- * UTF8). This is useful if you want to copy the file to another filesystem that
- * might have a different encoding. If the filename is not a valid string in the
- * encoding selected for the filesystem it is in then the copy name will not be set.
- *
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_COPY_NAME "standard::copy-name"           /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION:
- *
- * A key in the "standard" namespace for getting the description of the file.
- * The description is a utf8 string that describes the file, generally containing
- * the filename, but can also contain furter information. Example descriptions
- * could be "filename (on hostname)" for a remote file or "filename (in trash)"
- * for a file in the trash. This is useful for instance as the window title
- * when displaying a directory or for a bookmarks menu.
- *
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION "standard::description"        /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_ICON:
- *
- * A key in the "standard" namespace for getting the icon for the file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.
- * The value for this key should contain a #GIcon.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_ICON "standard::icon"                     /* object (GIcon) */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON:
- *
- * A key in the "standard" namespace for getting the symbolic icon for the file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.
- * The value for this key should contain a #GIcon.
- *
- * Since: 2.34
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON "standard::symbolic-icon"   /* object (GIcon) */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE:
- *
- * A key in the "standard" namespace for getting the content type of the file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- * The value for this key should contain a valid content type.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "standard::content-type"     /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE:
- *
- * A key in the "standard" namespace for getting the fast content type.
- * The fast content type isn't as reliable as the regular one, as it
- * only uses the filename to guess it, but it is faster to calculate than the
- * regular content type.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- *
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE "standard::fast-content-type" /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SIZE:
- *
- * A key in the "standard" namespace for getting the file's size (in bytes).
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SIZE "standard::size"                     /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE:
- *
- * A key in the "standard" namespace for getting the amount of disk space
- * that is consumed by the file (in bytes).  This will generally be larger
- * than the file size (due to block size overhead) but can occasionally be
- * smaller (for example, for sparse files).
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- *
- * Since: 2.20
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE "standard::allocated-size" /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET:
- *
- * A key in the "standard" namespace for getting the symlink target, if the file
- * is a symlink. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET "standard::symlink-target" /* byte string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_TARGET_URI:
- *
- * A key in the "standard" namespace for getting the target URI for the file, in
- * the case of %G_FILE_TYPE_SHORTCUT or %G_FILE_TYPE_MOUNTABLE files.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_TARGET_URI "standard::target-uri"         /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER:
- *
- * A key in the "standard" namespace for setting the sort order of a file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_INT32.
- * An example use would be in file managers, which would use this key
- * to set the order files are displayed. Files with smaller sort order
- * should be sorted first, and files without sort order as if sort order
- * was zero.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER "standard::sort-order"         /* int32  */
-
-/* Entity tags, used to avoid missing updates on save */
-
-/**
- * G_FILE_ATTRIBUTE_ETAG_VALUE:
- *
- * A key in the "etag" namespace for getting the value of the file's
- * entity tag. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_ETAG_VALUE "etag::value"                 /* string */
-
-/* File identifier, for e.g. avoiding loops when doing recursive
- * directory scanning
- */
-
-/**
- * G_FILE_ATTRIBUTE_ID_FILE:
- *
- * A key in the "id" namespace for getting a file identifier.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- * An example use would be during listing files, to avoid recursive
- * directory scanning.
- **/
-#define G_FILE_ATTRIBUTE_ID_FILE "id::file"                     /* string */
-
-/**
- * G_FILE_ATTRIBUTE_ID_FILESYSTEM:
- *
- * A key in the "id" namespace for getting the file system identifier.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- * An example use would be during drag and drop to see if the source
- * and target are on the same filesystem (default to move) or not (default
- * to copy).
- **/
-#define G_FILE_ATTRIBUTE_ID_FILESYSTEM "id::filesystem"         /* string */
-
-/* Calculated Access Rights for current user */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_READ:
- *
- * A key in the "access" namespace for getting read privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to read the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_READ "access::can-read"       /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE:
- *
- * A key in the "access" namespace for getting write privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to write to the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE "access::can-write"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE:
- *
- * A key in the "access" namespace for getting execution privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to execute the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE "access::can-execute" /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE:
- *
- * A key in the "access" namespace for checking deletion privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to delete the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE "access::can-delete"   /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH:
- *
- * A key in the "access" namespace for checking trashing privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to move the file to
- * the trash.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH "access::can-trash"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME:
- *
- * A key in the "access" namespace for checking renaming privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to rename the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME "access::can-rename"   /* boolean */
-
-/* TODO: Should we have special version for directories? can_enumerate, etc */
-
-/* Mountable attributes */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) is mountable.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT "mountable::can-mount"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE)  is unmountable.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT "mountable::can-unmount" /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be ejected.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT "mountable::can-eject"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE:
- *
- * A key in the "mountable" namespace for getting the unix device.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE "mountable::unix-device" /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE:
- *
- * A key in the "mountable" namespace for getting the unix device file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- *
- * Since: 2.22
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE "mountable::unix-device-file" /* string */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI:
- *
- * A key in the "mountable" namespace for getting the HAL UDI for the mountable
- * file. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI "mountable::hal-udi"         /* string */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be started.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START "mountable::can-start"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START_DEGRADED:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be started
- * degraded.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START_DEGRADED "mountable::can-start-degraded"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_STOP:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be stopped.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_STOP "mountable::can-stop"      /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_START_STOP_TYPE:
- *
- * A key in the "mountable" namespace for getting the #GDriveStartStopType.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_START_STOP_TYPE "mountable::start-stop-type" /* uint32 (GDriveStartStopType) */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_POLL:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be polled.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_POLL "mountable::can-poll"      /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE)
- * is automatically polled for media.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC "mountable::is-media-check-automatic"      /* boolean */
-
-/* Time attributes */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_MODIFIED:
- *
- * A key in the "time" namespace for getting the time the file was last
- * modified. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
- * file was modified.
- **/
-#define G_FILE_ATTRIBUTE_TIME_MODIFIED "time::modified"           /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC:
- *
- * A key in the "time" namespace for getting the miliseconds of the time
- * the file was last modified. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_MODIFIED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC "time::modified-usec" /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_ACCESS:
- *
- * A key in the "time" namespace for getting the time the file was last
- * accessed. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
- * file was last accessed.
- **/
-#define G_FILE_ATTRIBUTE_TIME_ACCESS "time::access"               /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_ACCESS_USEC:
- *
- * A key in the "time" namespace for getting the microseconds of the time
- * the file was last accessed. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_ACCESS. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_ACCESS_USEC "time::access-usec"     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CHANGED:
- *
- * A key in the "time" namespace for getting the time the file was last
- * changed. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
- * and contains the UNIX time since the file was last changed.
- *
- * This corresponds to the traditional UNIX ctime.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CHANGED "time::changed"             /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CHANGED_USEC:
- *
- * A key in the "time" namespace for getting the microseconds of the time
- * the file was last changed. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_CHANGED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CHANGED_USEC "time::changed-usec"   /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CREATED:
- *
- * A key in the "time" namespace for getting the time the file was created.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
- * and contains the UNIX time since the file was created.
- *
- * This corresponds to the NTFS ctime.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CREATED "time::created"             /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CREATED_USEC:
- *
- * A key in the "time" namespace for getting the microseconds of the time
- * the file was created. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_CREATED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CREATED_USEC "time::created-usec"   /* uint32 */
-
-/* Unix specific attributes */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_DEVICE:
- *
- * A key in the "unix" namespace for getting the device id of the device the
- * file is located on (see stat() documentation). This attribute is only
- * available for UNIX file systems. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_DEVICE "unix::device"               /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_INODE:
- *
- * A key in the "unix" namespace for getting the inode of the file.
- * This attribute is only available for UNIX file systems. Corresponding
- * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_INODE "unix::inode"                 /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_MODE:
- *
- * A key in the "unix" namespace for getting the mode of the file
- * (e.g. whether the file is a regular file, symlink, etc). See lstat()
- * documentation. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_MODE "unix::mode"                   /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_NLINK:
- *
- * A key in the "unix" namespace for getting the number of hard links
- * for a file. See lstat() documentation. This attribute is only available
- * for UNIX file systems. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_NLINK "unix::nlink"                 /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_UID:
- *
- * A key in the "unix" namespace for getting the user ID for the file.
- * This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_UID "unix::uid"                     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_GID:
- *
- * A key in the "unix" namespace for getting the group ID for the file.
- * This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_GID "unix::gid"                     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_RDEV:
- *
- * A key in the "unix" namespace for getting the device ID for the file
- * (if it is a special file). See lstat() documentation. This attribute
- * is only available for UNIX file systems. Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_RDEV "unix::rdev"                   /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE:
- *
- * A key in the "unix" namespace for getting the block size for the file
- * system. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE "unix::block-size"       /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_BLOCKS:
- *
- * A key in the "unix" namespace for getting the number of blocks allocated
- * for the file. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_BLOCKS "unix::blocks"               /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT:
- *
- * A key in the "unix" namespace for checking if the file represents a
- * UNIX mount point. This attribute is %TRUE if the file is a UNIX mount
- * point. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT "unix::is-mountpoint" /* boolean */
-
-/* DOS specific attributes */
-
-/**
- * G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE:
- *
- * A key in the "dos" namespace for checking if the file's archive flag
- * is set. This attribute is %TRUE if the archive flag is set. This attribute
- * is only available for DOS file systems. Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE "dos::is-archive"         /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_DOS_IS_SYSTEM:
- *
- * A key in the "dos" namespace for checking if the file's backup flag
- * is set. This attribute is %TRUE if the backup flag is set. This attribute
- * is only available for DOS file systems. Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_DOS_IS_SYSTEM "dos::is-system"           /* boolean */
-
-/* Owner attributes */
-
-/**
- * G_FILE_ATTRIBUTE_OWNER_USER:
- *
- * A key in the "owner" namespace for getting the user name of the
- * file's owner. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_OWNER_USER "owner::user"                 /* string */
-
-/**
- * G_FILE_ATTRIBUTE_OWNER_USER_REAL:
- *
- * A key in the "owner" namespace for getting the real name of the
- * user that owns the file. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_OWNER_USER_REAL "owner::user-real"       /* string */
-
-/**
- * G_FILE_ATTRIBUTE_OWNER_GROUP:
- *
- * A key in the "owner" namespace for getting the file owner's group.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_OWNER_GROUP "owner::group"               /* string */
-
-/* Thumbnails */
-
-/**
- * G_FILE_ATTRIBUTE_THUMBNAIL_PATH:
- *
- * A key in the "thumbnail" namespace for getting the path to the thumbnail
- * image. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_THUMBNAIL_PATH "thumbnail::path"         /* bytestring */
-/**
- * G_FILE_ATTRIBUTE_THUMBNAILING_FAILED:
- *
- * A key in the "thumbnail" namespace for checking if thumbnailing failed.
- * This attribute is %TRUE if thumbnailing failed. Corresponding
- * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_THUMBNAILING_FAILED "thumbnail::failed"         /* boolean */
-
-/* Preview */
-
-/**
- * G_FILE_ATTRIBUTE_PREVIEW_ICON:
- *
- * A key in the "preview" namespace for getting a #GIcon that can be
- * used to get preview of the file. For example, it may be a low
- * resolution thumbnail without metadata. Corresponding
- * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.  The value
- * for this key should contain a #GIcon.
- *
- * Since: 2.20
- **/
-#define G_FILE_ATTRIBUTE_PREVIEW_ICON "preview::icon"         /* object (GIcon) */
-
-/* File system info (for g_file_get_filesystem_info) */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_SIZE:
- *
- * A key in the "filesystem" namespace for getting the total size (in bytes) of the file system,
- * used in g_file_query_filesystem_info(). Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_SIZE "filesystem::size"                       /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_FREE:
- *
- * A key in the "filesystem" namespace for getting the number of bytes of free space left on the
- * file system. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_FREE "filesystem::free"                       /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_USED:
- *
- * A key in the "filesystem" namespace for getting the number of bytes of used on the
- * file system. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64.
- *
- * Since: 2.32
- */
-#define G_FILE_ATTRIBUTE_FILESYSTEM_USED "filesystem::used"                       /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_TYPE:
- *
- * A key in the "filesystem" namespace for getting the file system's type.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_TYPE "filesystem::type"                       /* string */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_READONLY:
- *
- * A key in the "filesystem" namespace for checking if the file system
- * is read only. Is set to %TRUE if the file system is read only.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_READONLY "filesystem::readonly"               /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW:
- *
- * A key in the "filesystem" namespace for hinting a file manager
- * application whether it should preview (e.g. thumbnail) files on the
- * file system. The value for this key contain a
- * #GFilesystemPreviewType.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW "filesystem::use-preview"        /* uint32 (GFilesystemPreviewType) */
-
-/**
- * G_FILE_ATTRIBUTE_GVFS_BACKEND:
- *
- * A key in the "gvfs" namespace that gets the name of the current
- * GVFS backend in use. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_GVFS_BACKEND "gvfs::backend"             /* string */
-
-/**
- * G_FILE_ATTRIBUTE_SELINUX_CONTEXT:
- *
- * A key in the "selinux" namespace for getting the file's SELinux
- * context. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING. Note that this attribute is only
- * available if GLib has been built with SELinux support.
- **/
-#define G_FILE_ATTRIBUTE_SELINUX_CONTEXT "selinux::context"       /* string */
-
-/**
- * G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT:
- *
- * A key in the "trash" namespace.  When requested against
- * "trash:///" returns the number of (toplevel) items in the trash folder.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT "trash::item-count"     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TRASH_ORIG_PATH:
- *
- * A key in the "trash" namespace.  When requested against
- * items in "trash:///", will return the original path to the file before it
- * was trashed. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- *
- * Since: 2.24.
- **/
-#define G_FILE_ATTRIBUTE_TRASH_ORIG_PATH "trash::orig-path"     /* byte string */
-
-/**
- * G_FILE_ATTRIBUTE_TRASH_DELETION_DATE:
- *
- * A key in the "trash" namespace.  When requested against
- * items in "trash:///", will return the date and time when the file
- * was trashed. The format of the returned string is YYYY-MM-DDThh:mm:ss.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- *
- * Since: 2.24.
- **/
-#define G_FILE_ATTRIBUTE_TRASH_DELETION_DATE "trash::deletion-date"  /* string */
-
-GLIB_AVAILABLE_IN_ALL
-GType              g_file_info_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *        g_file_info_new                       (void);
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *        g_file_info_dup                       (GFileInfo  *other);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_copy_into                 (GFileInfo  *src_info,
-							  GFileInfo  *dest_info);
-GLIB_AVAILABLE_IN_ALL
-gboolean           g_file_info_has_attribute             (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-gboolean           g_file_info_has_namespace             (GFileInfo  *info,
-							  const char *name_space);
-GLIB_AVAILABLE_IN_ALL
-char **            g_file_info_list_attributes           (GFileInfo  *info,
-							  const char *name_space);
-GLIB_AVAILABLE_IN_ALL
-gboolean           g_file_info_get_attribute_data        (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeType *type,
-							  gpointer   *value_pp,
-							  GFileAttributeStatus *status);
-GLIB_AVAILABLE_IN_ALL
-GFileAttributeType g_file_info_get_attribute_type        (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_remove_attribute          (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-GFileAttributeStatus g_file_info_get_attribute_status    (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-gboolean           g_file_info_set_attribute_status      (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeStatus status);
-GLIB_AVAILABLE_IN_ALL
-char *             g_file_info_get_attribute_as_string   (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-const char *       g_file_info_get_attribute_string      (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-const char *       g_file_info_get_attribute_byte_string (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-gboolean           g_file_info_get_attribute_boolean     (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-guint32            g_file_info_get_attribute_uint32      (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-gint32             g_file_info_get_attribute_int32       (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-guint64            g_file_info_get_attribute_uint64      (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-gint64             g_file_info_get_attribute_int64       (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-GObject *          g_file_info_get_attribute_object      (GFileInfo  *info,
-							  const char *attribute);
-GLIB_AVAILABLE_IN_ALL
-char **            g_file_info_get_attribute_stringv     (GFileInfo  *info,
-							  const char *attribute);
-
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_set_attribute             (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeType type,
-							  gpointer    value_p);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_set_attribute_string      (GFileInfo  *info,
-							  const char *attribute,
-							  const char *attr_value);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_set_attribute_byte_string (GFileInfo  *info,
-							  const char *attribute,
-							  const char *attr_value);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_set_attribute_boolean     (GFileInfo  *info,
-							  const char *attribute,
-							  gboolean    attr_value);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_set_attribute_uint32      (GFileInfo  *info,
-							  const char *attribute,
-							  guint32     attr_value);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_set_attribute_int32       (GFileInfo  *info,
-							  const char *attribute,
-							  gint32      attr_value);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_set_attribute_uint64      (GFileInfo  *info,
-							  const char *attribute,
-							  guint64     attr_value);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_set_attribute_int64       (GFileInfo  *info,
-							  const char *attribute,
-							  gint64      attr_value);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_set_attribute_object      (GFileInfo  *info,
-							  const char *attribute,
-							  GObject    *attr_value);
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_set_attribute_stringv     (GFileInfo  *info,
-							  const char *attribute,
-							  char      **attr_value);
-
-GLIB_AVAILABLE_IN_ALL
-void               g_file_info_clear_status              (GFileInfo  *info);
-
-/* Helper getters: */
-GLIB_AVAILABLE_IN_2_36
-GDateTime *       g_file_info_get_deletion_date      (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-GFileType         g_file_info_get_file_type          (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-gboolean          g_file_info_get_is_hidden          (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-gboolean          g_file_info_get_is_backup          (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-gboolean          g_file_info_get_is_symlink         (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-const char *      g_file_info_get_name               (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-const char *      g_file_info_get_display_name       (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-const char *      g_file_info_get_edit_name          (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-GIcon *           g_file_info_get_icon               (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-GIcon *           g_file_info_get_symbolic_icon      (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-const char *      g_file_info_get_content_type       (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-goffset           g_file_info_get_size               (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_get_modification_time  (GFileInfo         *info,
-						      GTimeVal          *result);
-GLIB_AVAILABLE_IN_ALL
-const char *      g_file_info_get_symlink_target     (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-const char *      g_file_info_get_etag               (GFileInfo         *info);
-GLIB_AVAILABLE_IN_ALL
-gint32            g_file_info_get_sort_order         (GFileInfo         *info);
-
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_attribute_mask     (GFileInfo         *info,
-						      GFileAttributeMatcher *mask);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_unset_attribute_mask   (GFileInfo         *info);
-
-/* Helper setters: */
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_file_type          (GFileInfo         *info,
-						      GFileType          type);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_is_hidden          (GFileInfo         *info,
-						      gboolean           is_hidden);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_is_symlink         (GFileInfo         *info,
-						      gboolean           is_symlink);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_name               (GFileInfo         *info,
-						      const char        *name);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_display_name       (GFileInfo         *info,
-						      const char        *display_name);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_edit_name          (GFileInfo         *info,
-						      const char        *edit_name);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_icon               (GFileInfo         *info,
-						      GIcon             *icon);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_symbolic_icon      (GFileInfo         *info,
-						      GIcon             *icon);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_content_type       (GFileInfo         *info,
-						      const char        *content_type);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_size               (GFileInfo         *info,
-						      goffset            size);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_modification_time  (GFileInfo         *info,
-						      GTimeVal          *mtime);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_symlink_target     (GFileInfo         *info,
-						      const char        *symlink_target);
-GLIB_AVAILABLE_IN_ALL
-void              g_file_info_set_sort_order         (GFileInfo         *info,
-						      gint32             sort_order);
-
-#define G_TYPE_FILE_ATTRIBUTE_MATCHER (g_file_attribute_matcher_get_type ())
-GLIB_AVAILABLE_IN_ALL
-GType g_file_attribute_matcher_get_type (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GFileAttributeMatcher *g_file_attribute_matcher_new            (const char            *attributes);
-GLIB_AVAILABLE_IN_ALL
-GFileAttributeMatcher *g_file_attribute_matcher_ref            (GFileAttributeMatcher *matcher);
-GLIB_AVAILABLE_IN_ALL
-void                   g_file_attribute_matcher_unref          (GFileAttributeMatcher *matcher);
-GLIB_AVAILABLE_IN_ALL
-GFileAttributeMatcher *g_file_attribute_matcher_subtract       (GFileAttributeMatcher *matcher,
-                                                                GFileAttributeMatcher *subtract);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_file_attribute_matcher_matches        (GFileAttributeMatcher *matcher,
-								const char            *attribute);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_file_attribute_matcher_matches_only   (GFileAttributeMatcher *matcher,
-								const char            *attribute);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher,
-								     const char            *ns);
-GLIB_AVAILABLE_IN_ALL
-const char *           g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher);
-GLIB_AVAILABLE_IN_2_32
-char *                 g_file_attribute_matcher_to_string      (GFileAttributeMatcher *matcher);
-
-G_END_DECLS
-
-#endif /* __G_FILE_INFO_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfileinputstream.h b/linux-x86/include/glib-2.0/gio/gfileinputstream.h
deleted file mode 100644
index 338ccae..0000000
--- a/linux-x86/include/glib-2.0/gio/gfileinputstream.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_FILE_INPUT_STREAM_H__
-#define __G_FILE_INPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/ginputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_INPUT_STREAM         (g_file_input_stream_get_type ())
-#define G_FILE_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_INPUT_STREAM, GFileInputStream))
-#define G_FILE_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_INPUT_STREAM, GFileInputStreamClass))
-#define G_IS_FILE_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_INPUT_STREAM))
-#define G_IS_FILE_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_INPUT_STREAM))
-#define G_FILE_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_INPUT_STREAM, GFileInputStreamClass))
-
-/**
- * GFileInputStream:
- *
- * A subclass of GInputStream for opened files. This adds
- * a few file-specific operations and seeking.
- *
- * #GFileInputStream implements #GSeekable.
- **/
-typedef struct _GFileInputStreamClass    GFileInputStreamClass;
-typedef struct _GFileInputStreamPrivate  GFileInputStreamPrivate;
-
-struct _GFileInputStream
-{
-  GInputStream parent_instance;
-
-  /*< private >*/
-  GFileInputStreamPrivate *priv;
-};
-
-struct _GFileInputStreamClass
-{
-  GInputStreamClass parent_class;
-
-  goffset     (* tell)              (GFileInputStream     *stream);
-  gboolean    (* can_seek)          (GFileInputStream     *stream);
-  gboolean    (* seek)	            (GFileInputStream     *stream,
-                                     goffset               offset,
-                                     GSeekType             type,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  GFileInfo * (* query_info)        (GFileInputStream     *stream,
-                                     const char           *attributes,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  void        (* query_info_async)  (GFileInputStream     *stream,
-                                     const char           *attributes,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GFileInfo * (* query_info_finish) (GFileInputStream     *stream,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType      g_file_input_stream_get_type          (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *g_file_input_stream_query_info        (GFileInputStream     *stream,
-						  const char           *attributes,
-						  GCancellable         *cancellable,
-						  GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void       g_file_input_stream_query_info_async  (GFileInputStream     *stream,
-						  const char           *attributes,
-						  int                   io_priority,
-						  GCancellable         *cancellable,
-						  GAsyncReadyCallback   callback,
-						  gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream     *stream,
-						  GAsyncResult         *result,
-						  GError              **error);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_INPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfileiostream.h b/linux-x86/include/glib-2.0/gio/gfileiostream.h
deleted file mode 100644
index 89a5536..0000000
--- a/linux-x86/include/glib-2.0/gio/gfileiostream.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* GIO - GLib Input, Io and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_FILE_IO_STREAM_H__
-#define __G_FILE_IO_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giostream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_IO_STREAM         (g_file_io_stream_get_type ())
-#define G_FILE_IO_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_IO_STREAM, GFileIOStream))
-#define G_FILE_IO_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_IO_STREAM, GFileIOStreamClass))
-#define G_IS_FILE_IO_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_IO_STREAM))
-#define G_IS_FILE_IO_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_IO_STREAM))
-#define G_FILE_IO_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_IO_STREAM, GFileIOStreamClass))
-
-/**
- * GFileIOStream:
- *
- * A subclass of GIOStream for opened files. This adds
- * a few file-specific operations and seeking and truncating.
- *
- * #GFileIOStream implements GSeekable.
- **/
-typedef struct _GFileIOStreamClass    GFileIOStreamClass;
-typedef struct _GFileIOStreamPrivate  GFileIOStreamPrivate;
-
-struct _GFileIOStream
-{
-  GIOStream parent_instance;
-
-  /*< private >*/
-  GFileIOStreamPrivate *priv;
-};
-
-struct _GFileIOStreamClass
-{
-  GIOStreamClass parent_class;
-
-  goffset     (* tell)              (GFileIOStream    *stream);
-  gboolean    (* can_seek)          (GFileIOStream    *stream);
-  gboolean    (* seek)	            (GFileIOStream    *stream,
-                                     goffset               offset,
-                                     GSeekType             type,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  gboolean    (* can_truncate)      (GFileIOStream    *stream);
-  gboolean    (* truncate_fn)       (GFileIOStream    *stream,
-                                     goffset               size,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  GFileInfo * (* query_info)        (GFileIOStream    *stream,
-                                     const char           *attributes,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  void        (* query_info_async)  (GFileIOStream     *stream,
-                                     const char            *attributes,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GFileInfo * (* query_info_finish) (GFileIOStream     *stream,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-  char      * (* get_etag)          (GFileIOStream    *stream);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType      g_file_io_stream_get_type          (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *g_file_io_stream_query_info        (GFileIOStream    *stream,
-					       const char           *attributes,
-					       GCancellable         *cancellable,
-					       GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void       g_file_io_stream_query_info_async  (GFileIOStream    *stream,
-					       const char           *attributes,
-					       int                   io_priority,
-					       GCancellable         *cancellable,
-					       GAsyncReadyCallback   callback,
-					       gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *g_file_io_stream_query_info_finish (GFileIOStream    *stream,
-					       GAsyncResult         *result,
-					       GError              **error);
-GLIB_AVAILABLE_IN_ALL
-char *     g_file_io_stream_get_etag          (GFileIOStream    *stream);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_IO_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfilemonitor.h b/linux-x86/include/glib-2.0/gio/gfilemonitor.h
deleted file mode 100644
index e29ad0a..0000000
--- a/linux-x86/include/glib-2.0/gio/gfilemonitor.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_FILE_MONITOR_H__
-#define __G_FILE_MONITOR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_MONITOR         (g_file_monitor_get_type ())
-#define G_FILE_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_MONITOR, GFileMonitor))
-#define G_FILE_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_MONITOR, GFileMonitorClass))
-#define G_IS_FILE_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_MONITOR))
-#define G_IS_FILE_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_MONITOR))
-#define G_FILE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_MONITOR, GFileMonitorClass))
-
-typedef struct _GFileMonitorClass       GFileMonitorClass;
-typedef struct _GFileMonitorPrivate	GFileMonitorPrivate;
-
-/**
- * GFileMonitor:
- *
- * Watches for changes to a file.
- **/
-struct _GFileMonitor
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GFileMonitorPrivate *priv;
-};
-
-struct _GFileMonitorClass
-{
-  GObjectClass parent_class;
-
-  /* Signals */
-  void     (* changed) (GFileMonitor      *monitor,
-                        GFile             *file,
-                        GFile             *other_file,
-                        GFileMonitorEvent  event_type);
-
-  /* Virtual Table */
-  gboolean (* cancel)  (GFileMonitor      *monitor);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_file_monitor_get_type       (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_monitor_cancel         (GFileMonitor      *monitor);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_monitor_is_cancelled   (GFileMonitor      *monitor);
-GLIB_AVAILABLE_IN_ALL
-void     g_file_monitor_set_rate_limit (GFileMonitor      *monitor,
-                                        gint               limit_msecs);
-
-
-/* For implementations */
-GLIB_AVAILABLE_IN_ALL
-void     g_file_monitor_emit_event     (GFileMonitor      *monitor,
-                                        GFile             *child,
-                                        GFile             *other_file,
-                                        GFileMonitorEvent  event_type);
-
-G_END_DECLS
-
-#endif /* __G_FILE_MONITOR_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfilenamecompleter.h b/linux-x86/include/glib-2.0/gio/gfilenamecompleter.h
deleted file mode 100644
index 0745bbb..0000000
--- a/linux-x86/include/glib-2.0/gio/gfilenamecompleter.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_FILENAME_COMPLETER_H__
-#define __G_FILENAME_COMPLETER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILENAME_COMPLETER         (g_filename_completer_get_type ())
-#define G_FILENAME_COMPLETER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILENAME_COMPLETER, GFilenameCompleter))
-#define G_FILENAME_COMPLETER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILENAME_COMPLETER, GFilenameCompleterClass))
-#define G_FILENAME_COMPLETER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILENAME_COMPLETER, GFilenameCompleterClass))
-#define G_IS_FILENAME_COMPLETER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILENAME_COMPLETER))
-#define G_IS_FILENAME_COMPLETER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILENAME_COMPLETER))
-
-/**
- * GFilenameCompleter:
- *
- * Completes filenames based on files that exist within the file system.
- **/
-typedef struct _GFilenameCompleterClass GFilenameCompleterClass;
-
-struct _GFilenameCompleterClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* signals */
-  void (* got_completion_data) (GFilenameCompleter *filename_completer);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType               g_filename_completer_get_type              (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GFilenameCompleter *g_filename_completer_new                   (void);
-
-GLIB_AVAILABLE_IN_ALL
-char *              g_filename_completer_get_completion_suffix (GFilenameCompleter *completer,
-                                                                const char *initial_text);
-GLIB_AVAILABLE_IN_ALL
-char **             g_filename_completer_get_completions       (GFilenameCompleter *completer,
-                                                                const char *initial_text);
-GLIB_AVAILABLE_IN_ALL
-void                g_filename_completer_set_dirs_only         (GFilenameCompleter *completer,
-                                                                gboolean dirs_only);
-
-G_END_DECLS
-
-#endif /* __G_FILENAME_COMPLETER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfileoutputstream.h b/linux-x86/include/glib-2.0/gio/gfileoutputstream.h
deleted file mode 100644
index 5e8a5fe..0000000
--- a/linux-x86/include/glib-2.0/gio/gfileoutputstream.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_FILE_OUTPUT_STREAM_H__
-#define __G_FILE_OUTPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/goutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_OUTPUT_STREAM         (g_file_output_stream_get_type ())
-#define G_FILE_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_OUTPUT_STREAM, GFileOutputStream))
-#define G_FILE_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_OUTPUT_STREAM, GFileOutputStreamClass))
-#define G_IS_FILE_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_OUTPUT_STREAM))
-#define G_IS_FILE_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_OUTPUT_STREAM))
-#define G_FILE_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_OUTPUT_STREAM, GFileOutputStreamClass))
-
-/**
- * GFileOutputStream:
- *
- * A subclass of GOutputStream for opened files. This adds
- * a few file-specific operations and seeking and truncating.
- *
- * #GFileOutputStream implements GSeekable.
- **/
-typedef struct _GFileOutputStreamClass    GFileOutputStreamClass;
-typedef struct _GFileOutputStreamPrivate  GFileOutputStreamPrivate;
-
-struct _GFileOutputStream
-{
-  GOutputStream parent_instance;
-
-  /*< private >*/
-  GFileOutputStreamPrivate *priv;
-};
-
-struct _GFileOutputStreamClass
-{
-  GOutputStreamClass parent_class;
-
-  goffset     (* tell)              (GFileOutputStream    *stream);
-  gboolean    (* can_seek)          (GFileOutputStream    *stream);
-  gboolean    (* seek)	            (GFileOutputStream    *stream,
-                                     goffset               offset,
-                                     GSeekType             type,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  gboolean    (* can_truncate)      (GFileOutputStream    *stream);
-  gboolean    (* truncate_fn)       (GFileOutputStream    *stream,
-                                     goffset               size,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  GFileInfo * (* query_info)        (GFileOutputStream    *stream,
-                                     const char           *attributes,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  void        (* query_info_async)  (GFileOutputStream     *stream,
-                                     const char            *attributes,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GFileInfo * (* query_info_finish) (GFileOutputStream     *stream,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-  char      * (* get_etag)          (GFileOutputStream    *stream);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType      g_file_output_stream_get_type          (void) G_GNUC_CONST;
-
-
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *g_file_output_stream_query_info        (GFileOutputStream    *stream,
-                                                   const char           *attributes,
-                                                   GCancellable         *cancellable,
-                                                   GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void       g_file_output_stream_query_info_async  (GFileOutputStream    *stream,
-						   const char           *attributes,
-						   int                   io_priority,
-						   GCancellable         *cancellable,
-						   GAsyncReadyCallback   callback,
-						   gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream    *stream,
-						   GAsyncResult         *result,
-						   GError              **error);
-GLIB_AVAILABLE_IN_ALL
-char *     g_file_output_stream_get_etag          (GFileOutputStream    *stream);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_OUTPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfilterinputstream.h b/linux-x86/include/glib-2.0/gio/gfilterinputstream.h
deleted file mode 100644
index afe15a5..0000000
--- a/linux-x86/include/glib-2.0/gio/gfilterinputstream.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#ifndef __G_FILTER_INPUT_STREAM_H__
-#define __G_FILTER_INPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/ginputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILTER_INPUT_STREAM         (g_filter_input_stream_get_type ())
-#define G_FILTER_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILTER_INPUT_STREAM, GFilterInputStream))
-#define G_FILTER_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILTER_INPUT_STREAM, GFilterInputStreamClass))
-#define G_IS_FILTER_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILTER_INPUT_STREAM))
-#define G_IS_FILTER_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILTER_INPUT_STREAM))
-#define G_FILTER_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILTER_INPUT_STREAM, GFilterInputStreamClass))
-
-/**
- * GFilterInputStream:
- *
- * A base class for all input streams that work on an underlying stream.
- **/
-typedef struct _GFilterInputStreamClass    GFilterInputStreamClass;
-
-struct _GFilterInputStream
-{
-  GInputStream parent_instance;
-
-  /*<protected >*/
-  GInputStream *base_stream;
-};
-
-struct _GFilterInputStreamClass
-{
-  GInputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-};
-
-
-GLIB_AVAILABLE_IN_ALL
-GType          g_filter_input_stream_get_type              (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GInputStream * g_filter_input_stream_get_base_stream       (GFilterInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_filter_input_stream_get_close_base_stream (GFilterInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
-void           g_filter_input_stream_set_close_base_stream (GFilterInputStream *stream,
-                                                            gboolean            close_base);
-
-G_END_DECLS
-
-#endif /* __G_FILTER_INPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gfilteroutputstream.h b/linux-x86/include/glib-2.0/gio/gfilteroutputstream.h
deleted file mode 100644
index 7e29086..0000000
--- a/linux-x86/include/glib-2.0/gio/gfilteroutputstream.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#ifndef __G_FILTER_OUTPUT_STREAM_H__
-#define __G_FILTER_OUTPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/goutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILTER_OUTPUT_STREAM         (g_filter_output_stream_get_type ())
-#define G_FILTER_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStream))
-#define G_FILTER_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStreamClass))
-#define G_IS_FILTER_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILTER_OUTPUT_STREAM))
-#define G_IS_FILTER_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILTER_OUTPUT_STREAM))
-#define G_FILTER_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStreamClass))
-
-/**
- * GFilterOutputStream:
- *
- * A base class for all output streams that work on an underlying stream.
- **/
-typedef struct _GFilterOutputStreamClass    GFilterOutputStreamClass;
-
-struct _GFilterOutputStream
-{
-  GOutputStream parent_instance;
-
-  /*< protected >*/
-  GOutputStream *base_stream;
-};
-
-struct _GFilterOutputStreamClass
-{
-  GOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-};
-
-
-GLIB_AVAILABLE_IN_ALL
-GType           g_filter_output_stream_get_type              (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GOutputStream * g_filter_output_stream_get_base_stream       (GFilterOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
-void            g_filter_output_stream_set_close_base_stream (GFilterOutputStream *stream,
-                                                              gboolean             close_base);
-
-G_END_DECLS
-
-#endif /* __G_FILTER_OUTPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gicon.h b/linux-x86/include/glib-2.0/gio/gicon.h
deleted file mode 100644
index f378146..0000000
--- a/linux-x86/include/glib-2.0/gio/gicon.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_ICON_H__
-#define __G_ICON_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ICON            (g_icon_get_type ())
-#define G_ICON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_ICON, GIcon))
-#define G_IS_ICON(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ICON))
-#define G_ICON_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ICON, GIconIface))
-
-/**
- * GIcon:
- *
- * An abstract type that specifies an icon.
- **/
-typedef struct _GIconIface GIconIface;
-
-/**
- * GIconIface:
- * @g_iface: The parent interface.
- * @hash: A hash for a given #GIcon.
- * @equal: Checks if two #GIcon<!-- -->s are equal.
- * @to_tokens: Serializes a #GIcon into tokens. The tokens must not
- * contain any whitespace. Don't implement if the #GIcon can't be
- * serialized (Since 2.20).
- * @from_tokens: Constructs a #GIcon from tokens. Set the #GError if
- * the tokens are malformed. Don't implement if the #GIcon can't be
- * serialized (Since 2.20).
- *
- * GIconIface is used to implement GIcon types for various
- * different systems. See #GThemedIcon and #GLoadableIcon for
- * examples of how to implement this interface.
- */
-struct _GIconIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  guint       (* hash)        (GIcon   *icon);
-  gboolean    (* equal)       (GIcon   *icon1,
-                               GIcon   *icon2);
-  gboolean    (* to_tokens)   (GIcon   *icon,
-			       GPtrArray *tokens,
-                               gint    *out_version);
-  GIcon *     (* from_tokens) (gchar  **tokens,
-                               gint     num_tokens,
-                               gint     version,
-                               GError **error);
-
-  GVariant *  (* serialize)   (GIcon   *icon);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_icon_get_type  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-guint    g_icon_hash            (gconstpointer  icon);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_icon_equal           (GIcon         *icon1,
-                                 GIcon         *icon2);
-GLIB_AVAILABLE_IN_ALL
-gchar   *g_icon_to_string       (GIcon         *icon);
-GLIB_AVAILABLE_IN_ALL
-GIcon   *g_icon_new_for_string  (const gchar   *str,
-                                 GError       **error);
-
-GLIB_AVAILABLE_IN_2_38
-GVariant * g_icon_serialize     (GIcon         *icon);
-GLIB_AVAILABLE_IN_2_38
-GIcon *    g_icon_deserialize   (GVariant      *value);
-
-G_END_DECLS
-
-#endif /* __G_ICON_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/ginetaddress.h b/linux-x86/include/glib-2.0/gio/ginetaddress.h
deleted file mode 100644
index 940b798..0000000
--- a/linux-x86/include/glib-2.0/gio/ginetaddress.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- */
-
-#ifndef __G_INET_ADDRESS_H__
-#define __G_INET_ADDRESS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INET_ADDRESS         (g_inet_address_get_type ())
-#define G_INET_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INET_ADDRESS, GInetAddress))
-#define G_INET_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INET_ADDRESS, GInetAddressClass))
-#define G_IS_INET_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INET_ADDRESS))
-#define G_IS_INET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INET_ADDRESS))
-#define G_INET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INET_ADDRESS, GInetAddressClass))
-
-typedef struct _GInetAddressClass   GInetAddressClass;
-typedef struct _GInetAddressPrivate GInetAddressPrivate;
-
-struct _GInetAddress
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GInetAddressPrivate *priv;
-};
-
-struct _GInetAddressClass
-{
-  GObjectClass parent_class;
-
-  gchar *        (*to_string) (GInetAddress *address);
-  const guint8 * (*to_bytes)  (GInetAddress *address);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                 g_inet_address_get_type             (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GInetAddress *        g_inet_address_new_from_string      (const gchar          *string);
-
-GLIB_AVAILABLE_IN_ALL
-GInetAddress *        g_inet_address_new_from_bytes       (const guint8         *bytes,
-							   GSocketFamily         family);
-
-GLIB_AVAILABLE_IN_ALL
-GInetAddress *        g_inet_address_new_loopback         (GSocketFamily         family);
-
-GLIB_AVAILABLE_IN_ALL
-GInetAddress *        g_inet_address_new_any              (GSocketFamily         family);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_equal                (GInetAddress         *address,
-                                                           GInetAddress         *other_address);
-
-GLIB_AVAILABLE_IN_ALL
-gchar *               g_inet_address_to_string            (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-const guint8 *        g_inet_address_to_bytes             (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gsize                 g_inet_address_get_native_size      (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-GSocketFamily         g_inet_address_get_family           (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_get_is_any           (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_get_is_loopback      (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_get_is_link_local    (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_get_is_site_local    (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_get_is_multicast     (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_get_is_mc_global     (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_get_is_mc_link_local (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_get_is_mc_node_local (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_get_is_mc_org_local  (GInetAddress         *address);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_inet_address_get_is_mc_site_local (GInetAddress         *address);
-
-G_END_DECLS
-
-#endif /* __G_INET_ADDRESS_H__ */
-
diff --git a/linux-x86/include/glib-2.0/gio/ginetaddressmask.h b/linux-x86/include/glib-2.0/gio/ginetaddressmask.h
deleted file mode 100644
index 05b0630..0000000
--- a/linux-x86/include/glib-2.0/gio/ginetaddressmask.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_INET_ADDRESS_MASK_H__
-#define __G_INET_ADDRESS_MASK_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INET_ADDRESS_MASK         (g_inet_address_mask_get_type ())
-#define G_INET_ADDRESS_MASK(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INET_ADDRESS_MASK, GInetAddressMask))
-#define G_INET_ADDRESS_MASK_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INET_ADDRESS_MASK, GInetAddressMaskClass))
-#define G_IS_INET_ADDRESS_MASK(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INET_ADDRESS_MASK))
-#define G_IS_INET_ADDRESS_MASK_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INET_ADDRESS_MASK))
-#define G_INET_ADDRESS_MASK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INET_ADDRESS_MASK, GInetAddressMaskClass))
-
-typedef struct _GInetAddressMaskClass   GInetAddressMaskClass;
-typedef struct _GInetAddressMaskPrivate GInetAddressMaskPrivate;
-
-struct _GInetAddressMask
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GInetAddressMaskPrivate *priv;
-};
-
-struct _GInetAddressMaskClass
-{
-  GObjectClass parent_class;
-
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType g_inet_address_mask_get_type (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GInetAddressMask *g_inet_address_mask_new             (GInetAddress      *addr,
-						       guint              length,
-						       GError           **error);
-
-GLIB_AVAILABLE_IN_2_32
-GInetAddressMask *g_inet_address_mask_new_from_string (const gchar       *mask_string,
-						       GError           **error);
-GLIB_AVAILABLE_IN_2_32
-gchar            *g_inet_address_mask_to_string       (GInetAddressMask  *mask);
-
-GLIB_AVAILABLE_IN_2_32
-GSocketFamily     g_inet_address_mask_get_family      (GInetAddressMask  *mask);
-GLIB_AVAILABLE_IN_2_32
-GInetAddress     *g_inet_address_mask_get_address     (GInetAddressMask  *mask);
-GLIB_AVAILABLE_IN_2_32
-guint             g_inet_address_mask_get_length      (GInetAddressMask  *mask);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean          g_inet_address_mask_matches         (GInetAddressMask  *mask,
-						       GInetAddress      *address);
-GLIB_AVAILABLE_IN_2_32
-gboolean          g_inet_address_mask_equal           (GInetAddressMask  *mask,
-						       GInetAddressMask  *mask2);
-
-G_END_DECLS
-
-#endif /* __G_INET_ADDRESS_MASK_H__ */
-
diff --git a/linux-x86/include/glib-2.0/gio/ginetsocketaddress.h b/linux-x86/include/glib-2.0/gio/ginetsocketaddress.h
deleted file mode 100644
index 1865a3b..0000000
--- a/linux-x86/include/glib-2.0/gio/ginetsocketaddress.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- */
-
-#ifndef __G_INET_SOCKET_ADDRESS_H__
-#define __G_INET_SOCKET_ADDRESS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gsocketaddress.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INET_SOCKET_ADDRESS         (g_inet_socket_address_get_type ())
-#define G_INET_SOCKET_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INET_SOCKET_ADDRESS, GInetSocketAddress))
-#define G_INET_SOCKET_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INET_SOCKET_ADDRESS, GInetSocketAddressClass))
-#define G_IS_INET_SOCKET_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INET_SOCKET_ADDRESS))
-#define G_IS_INET_SOCKET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INET_SOCKET_ADDRESS))
-#define G_INET_SOCKET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INET_SOCKET_ADDRESS, GInetSocketAddressClass))
-
-typedef struct _GInetSocketAddressClass   GInetSocketAddressClass;
-typedef struct _GInetSocketAddressPrivate GInetSocketAddressPrivate;
-
-struct _GInetSocketAddress
-{
-  GSocketAddress parent_instance;
-
-  /*< private >*/
-  GInetSocketAddressPrivate *priv;
-};
-
-struct _GInetSocketAddressClass
-{
-  GSocketAddressClass parent_class;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType           g_inet_socket_address_get_type     (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress *g_inet_socket_address_new          (GInetAddress       *address,
-						    guint16             port);
-
-GLIB_AVAILABLE_IN_ALL
-GInetAddress *  g_inet_socket_address_get_address  (GInetSocketAddress *address);
-GLIB_AVAILABLE_IN_ALL
-guint16         g_inet_socket_address_get_port     (GInetSocketAddress *address);
-
-GLIB_AVAILABLE_IN_2_32
-guint32         g_inet_socket_address_get_flowinfo (GInetSocketAddress *address);
-GLIB_AVAILABLE_IN_2_32
-guint32         g_inet_socket_address_get_scope_id (GInetSocketAddress *address);
-
-G_END_DECLS
-
-#endif /* __G_INET_SOCKET_ADDRESS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/ginitable.h b/linux-x86/include/glib-2.0/gio/ginitable.h
deleted file mode 100644
index c147013..0000000
--- a/linux-x86/include/glib-2.0/gio/ginitable.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_INITABLE_H__
-#define __G_INITABLE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INITABLE            (g_initable_get_type ())
-#define G_INITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_INITABLE, GInitable))
-#define G_IS_INITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_INITABLE))
-#define G_INITABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_INITABLE, GInitableIface))
-#define G_TYPE_IS_INITABLE(type)   (g_type_is_a ((type), G_TYPE_INITABLE))
-
-/**
- * GInitable:
- *
- * Interface for initializable objects.
- *
- * Since: 2.22
- **/
-typedef struct _GInitableIface GInitableIface;
-
-/**
- * GInitableIface:
- * @g_iface: The parent interface.
- * @init: Initializes the object.
- *
- * Provides an interface for initializing object such that initialization
- * may fail.
- *
- * Since: 2.22
- **/
-struct _GInitableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  gboolean    (* init) (GInitable    *initable,
-			GCancellable *cancellable,
-			GError      **error);
-};
-
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_initable_get_type   (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_initable_init       (GInitable     *initable,
-				GCancellable  *cancellable,
-				GError       **error);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer g_initable_new        (GType          object_type,
-				GCancellable  *cancellable,
-				GError       **error,
-				const gchar   *first_property_name,
-				...);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_initable_newv       (GType          object_type,
-				guint          n_parameters,
-				GParameter    *parameters,
-				GCancellable  *cancellable,
-				GError       **error);
-GLIB_AVAILABLE_IN_ALL
-GObject* g_initable_new_valist (GType          object_type,
-				const gchar   *first_property_name,
-				va_list        var_args,
-				GCancellable  *cancellable,
-				GError       **error);
-
-G_END_DECLS
-
-
-#endif /* __G_INITABLE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/ginputstream.h b/linux-x86/include/glib-2.0/gio/ginputstream.h
deleted file mode 100644
index bedfba7..0000000
--- a/linux-x86/include/glib-2.0/gio/ginputstream.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_INPUT_STREAM_H__
-#define __G_INPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INPUT_STREAM         (g_input_stream_get_type ())
-#define G_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INPUT_STREAM, GInputStream))
-#define G_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INPUT_STREAM, GInputStreamClass))
-#define G_IS_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INPUT_STREAM))
-#define G_IS_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INPUT_STREAM))
-#define G_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INPUT_STREAM, GInputStreamClass))
-
-/**
- * GInputStream:
- *
- * Base class for streaming input operations.
- **/
-typedef struct _GInputStreamClass    GInputStreamClass;
-typedef struct _GInputStreamPrivate  GInputStreamPrivate;
-
-struct _GInputStream
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GInputStreamPrivate *priv;
-};
-
-struct _GInputStreamClass
-{
-  GObjectClass parent_class;
-
-  /* Sync ops: */
-
-  gssize   (* read_fn)      (GInputStream        *stream,
-                             void                *buffer,
-                             gsize                count,
-                             GCancellable        *cancellable,
-                             GError             **error);
-  gssize   (* skip)         (GInputStream        *stream,
-                             gsize                count,
-                             GCancellable        *cancellable,
-                             GError             **error);
-  gboolean (* close_fn)	    (GInputStream        *stream,
-                             GCancellable        *cancellable,
-                             GError             **error);
-
-  /* Async ops: (optional in derived classes) */
-  void     (* read_async)   (GInputStream        *stream,
-                             void                *buffer,
-                             gsize                count,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gssize   (* read_finish)  (GInputStream        *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-  void     (* skip_async)   (GInputStream        *stream,
-                             gsize                count,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gssize   (* skip_finish)  (GInputStream        *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-  void     (* close_async)  (GInputStream        *stream,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gboolean (* close_finish) (GInputStream        *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_input_stream_get_type      (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gssize   g_input_stream_read          (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_input_stream_read_all      (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       gsize                 *bytes_read,
-				       GCancellable          *cancellable,
-				       GError               **error);
-GLIB_AVAILABLE_IN_2_34
-GBytes  *g_input_stream_read_bytes    (GInputStream          *stream,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gssize   g_input_stream_skip          (GInputStream          *stream,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_input_stream_close         (GInputStream          *stream,
-				       GCancellable          *cancellable,
-				       GError               **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_input_stream_read_async    (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-GLIB_AVAILABLE_IN_ALL
-gssize   g_input_stream_read_finish   (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-GLIB_AVAILABLE_IN_2_34
-void     g_input_stream_read_bytes_async  (GInputStream          *stream,
-					   gsize                  count,
-					   int                    io_priority,
-					   GCancellable          *cancellable,
-					   GAsyncReadyCallback    callback,
-					   gpointer               user_data);
-GLIB_AVAILABLE_IN_2_34
-GBytes  *g_input_stream_read_bytes_finish (GInputStream          *stream,
-					   GAsyncResult          *result,
-					   GError               **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_input_stream_skip_async    (GInputStream          *stream,
-				       gsize                  count,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-GLIB_AVAILABLE_IN_ALL
-gssize   g_input_stream_skip_finish   (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_input_stream_close_async   (GInputStream          *stream,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_input_stream_close_finish  (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-
-/* For implementations: */
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_input_stream_is_closed     (GInputStream          *stream);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_input_stream_has_pending   (GInputStream          *stream);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_input_stream_set_pending   (GInputStream          *stream,
-				       GError               **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_input_stream_clear_pending (GInputStream          *stream);
-
-G_END_DECLS
-
-#endif /* __G_INPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gio.h b/linux-x86/include/glib-2.0/gio/gio.h
deleted file mode 100644
index fadcd58..0000000
--- a/linux-x86/include/glib-2.0/gio/gio.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_IO_H__
-#define __G_IO_H__
-
-#define __GIO_GIO_H_INSIDE__
-
-#include <gio/giotypes.h>
-
-#include <gio/gaction.h>
-#include <gio/gactiongroup.h>
-#include <gio/gactiongroupexporter.h>
-#include <gio/gactionmap.h>
-#include <gio/gappinfo.h>
-#include <gio/gapplication.h>
-#include <gio/gapplicationcommandline.h>
-#include <gio/gasyncinitable.h>
-#include <gio/gasyncresult.h>
-#include <gio/gbufferedinputstream.h>
-#include <gio/gbufferedoutputstream.h>
-#include <gio/gbytesicon.h>
-#include <gio/gcancellable.h>
-#include <gio/gcharsetconverter.h>
-#include <gio/gcontenttype.h>
-#include <gio/gconverter.h>
-#include <gio/gconverterinputstream.h>
-#include <gio/gconverteroutputstream.h>
-#include <gio/gcredentials.h>
-#include <gio/gdatainputstream.h>
-#include <gio/gdataoutputstream.h>
-#include <gio/gdbusaddress.h>
-#include <gio/gdbusauthobserver.h>
-#include <gio/gdbusconnection.h>
-#include <gio/gdbuserror.h>
-#include <gio/gdbusintrospection.h>
-#include <gio/gdbusmessage.h>
-#include <gio/gdbusmethodinvocation.h>
-#include <gio/gdbusnameowning.h>
-#include <gio/gdbusnamewatching.h>
-#include <gio/gdbusproxy.h>
-#include <gio/gdbusserver.h>
-#include <gio/gdbusutils.h>
-#include <gio/gdrive.h>
-#include <gio/gemblemedicon.h>
-#include <gio/gfileattribute.h>
-#include <gio/gfileenumerator.h>
-#include <gio/gfile.h>
-#include <gio/gfileicon.h>
-#include <gio/gfileinfo.h>
-#include <gio/gfileinputstream.h>
-#include <gio/gfileiostream.h>
-#include <gio/gfilemonitor.h>
-#include <gio/gfilenamecompleter.h>
-#include <gio/gfileoutputstream.h>
-#include <gio/gfilterinputstream.h>
-#include <gio/gfilteroutputstream.h>
-#include <gio/gicon.h>
-#include <gio/ginetaddress.h>
-#include <gio/ginetaddressmask.h>
-#include <gio/ginetsocketaddress.h>
-#include <gio/ginitable.h>
-#include <gio/ginputstream.h>
-#include <gio/gioenums.h>
-#include <gio/gioenumtypes.h>
-#include <gio/gioerror.h>
-#include <gio/giomodule.h>
-#include <gio/gioscheduler.h>
-#include <gio/giostream.h>
-#include <gio/gloadableicon.h>
-#include <gio/gmemoryinputstream.h>
-#include <gio/gmemoryoutputstream.h>
-#include <gio/gmount.h>
-#include <gio/gmountoperation.h>
-#include <gio/gnativevolumemonitor.h>
-#include <gio/gnetworkaddress.h>
-#include <gio/gnetworkmonitor.h>
-#include <gio/gnetworkservice.h>
-#include <gio/goutputstream.h>
-#include <gio/gpermission.h>
-#include <gio/gpollableinputstream.h>
-#include <gio/gpollableoutputstream.h>
-#include <gio/gpollableutils.h>
-#include <gio/gpropertyaction.h>
-#include <gio/gproxy.h>
-#include <gio/gproxyaddress.h>
-#include <gio/gproxyaddressenumerator.h>
-#include <gio/gproxyresolver.h>
-#include <gio/gresolver.h>
-#include <gio/gresource.h>
-#include <gio/gseekable.h>
-#include <gio/gsettingsschema.h>
-#include <gio/gsettings.h>
-#include <gio/gsimpleaction.h>
-#include <gio/gsimpleactiongroup.h>
-#include <gio/gsimpleasyncresult.h>
-#include <gio/gsimplepermission.h>
-#include <gio/gsocketaddressenumerator.h>
-#include <gio/gsocketaddress.h>
-#include <gio/gsocketclient.h>
-#include <gio/gsocketconnectable.h>
-#include <gio/gsocketconnection.h>
-#include <gio/gsocketcontrolmessage.h>
-#include <gio/gsocket.h>
-#include <gio/gsocketlistener.h>
-#include <gio/gsocketservice.h>
-#include <gio/gsrvtarget.h>
-#include <gio/gsimpleproxyresolver.h>
-#include <gio/gtask.h>
-#include <gio/gtcpconnection.h>
-#include <gio/gtcpwrapperconnection.h>
-#include <gio/gtestdbus.h>
-#include <gio/gthemedicon.h>
-#include <gio/gthreadedsocketservice.h>
-#include <gio/gtlsbackend.h>
-#include <gio/gtlscertificate.h>
-#include <gio/gtlsclientconnection.h>
-#include <gio/gtlsconnection.h>
-#include <gio/gtlsdatabase.h>
-#include <gio/gtlsfiledatabase.h>
-#include <gio/gtlsinteraction.h>
-#include <gio/gtlsserverconnection.h>
-#include <gio/gtlspassword.h>
-#include <gio/gvfs.h>
-#include <gio/gvolume.h>
-#include <gio/gvolumemonitor.h>
-#include <gio/gzlibcompressor.h>
-#include <gio/gzlibdecompressor.h>
-#include <gio/gdbusinterface.h>
-#include <gio/gdbusinterfaceskeleton.h>
-#include <gio/gdbusobject.h>
-#include <gio/gdbusobjectskeleton.h>
-#include <gio/gdbusobjectproxy.h>
-#include <gio/gdbusobjectmanager.h>
-#include <gio/gdbusobjectmanagerclient.h>
-#include <gio/gdbusobjectmanagerserver.h>
-#include <gio/gdbusactiongroup.h>
-#include <gio/gremoteactiongroup.h>
-#include <gio/gmenumodel.h>
-#include <gio/gmenu.h>
-#include <gio/gmenuexporter.h>
-#include <gio/gdbusmenumodel.h>
-
-#undef __GIO_GIO_H_INSIDE__
-
-#endif /* __G_IO_H__ */
-
diff --git a/linux-x86/include/glib-2.0/gio/gioenums.h b/linux-x86/include/glib-2.0/gio/gioenums.h
deleted file mode 100644
index 4ce0855..0000000
--- a/linux-x86/include/glib-2.0/gio/gioenums.h
+++ /dev/null
@@ -1,1694 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __GIO_ENUMS_H__
-#define __GIO_ENUMS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-/**
- * GAppInfoCreateFlags:
- * @G_APP_INFO_CREATE_NONE: No flags.
- * @G_APP_INFO_CREATE_NEEDS_TERMINAL: Application opens in a terminal window.
- * @G_APP_INFO_CREATE_SUPPORTS_URIS: Application supports URI arguments.
- * @G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION: Application supports startup notification. Since 2.26
- *
- * Flags used when creating a #GAppInfo.
- */
-typedef enum {
-  G_APP_INFO_CREATE_NONE                           = 0,         /*< nick=none >*/
-  G_APP_INFO_CREATE_NEEDS_TERMINAL                 = (1 << 0),  /*< nick=needs-terminal >*/
-  G_APP_INFO_CREATE_SUPPORTS_URIS                  = (1 << 1),  /*< nick=supports-uris >*/
-  G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION  = (1 << 2)   /*< nick=supports-startup-notification >*/
-} GAppInfoCreateFlags;
-
-/**
- * GConverterFlags:
- * @G_CONVERTER_NO_FLAGS: No flags.
- * @G_CONVERTER_INPUT_AT_END: At end of input data
- * @G_CONVERTER_FLUSH: Flush data
- *
- * Flags used when calling a g_converter_convert().
- *
- * Since: 2.24
- */
-typedef enum {
-  G_CONVERTER_NO_FLAGS     = 0,         /*< nick=none >*/
-  G_CONVERTER_INPUT_AT_END = (1 << 0),  /*< nick=input-at-end >*/
-  G_CONVERTER_FLUSH        = (1 << 1)   /*< nick=flush >*/
-} GConverterFlags;
-
-/**
- * GConverterResult:
- * @G_CONVERTER_ERROR: There was an error during conversion.
- * @G_CONVERTER_CONVERTED: Some data was consumed or produced
- * @G_CONVERTER_FINISHED: The conversion is finished
- * @G_CONVERTER_FLUSHED: Flushing is finished
- *
- * Results returned from g_converter_convert().
- *
- * Since: 2.24
- */
-typedef enum {
-  G_CONVERTER_ERROR     = 0,  /*< nick=error >*/
-  G_CONVERTER_CONVERTED = 1,  /*< nick=converted >*/
-  G_CONVERTER_FINISHED  = 2,  /*< nick=finished >*/
-  G_CONVERTER_FLUSHED   = 3   /*< nick=flushed >*/
-} GConverterResult;
-
-
-/**
- * GDataStreamByteOrder:
- * @G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN: Selects Big Endian byte order.
- * @G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN: Selects Little Endian byte order.
- * @G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN: Selects endianness based on host machine's architecture.
- *
- * #GDataStreamByteOrder is used to ensure proper endianness of streaming data sources
- * across various machine architectures.
- *
- **/
-typedef enum {
-  G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN,
-  G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN,
-  G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN
-} GDataStreamByteOrder;
-
-
-/**
- * GDataStreamNewlineType:
- * @G_DATA_STREAM_NEWLINE_TYPE_LF: Selects "LF" line endings, common on most modern UNIX platforms.
- * @G_DATA_STREAM_NEWLINE_TYPE_CR: Selects "CR" line endings.
- * @G_DATA_STREAM_NEWLINE_TYPE_CR_LF: Selects "CR, LF" line ending, common on Microsoft Windows.
- * @G_DATA_STREAM_NEWLINE_TYPE_ANY: Automatically try to handle any line ending type.
- *
- * #GDataStreamNewlineType is used when checking for or setting the line endings for a given file.
- **/
-typedef enum {
-  G_DATA_STREAM_NEWLINE_TYPE_LF,
-  G_DATA_STREAM_NEWLINE_TYPE_CR,
-  G_DATA_STREAM_NEWLINE_TYPE_CR_LF,
-  G_DATA_STREAM_NEWLINE_TYPE_ANY
-} GDataStreamNewlineType;
-
-
-/**
- * GFileAttributeType:
- * @G_FILE_ATTRIBUTE_TYPE_INVALID: indicates an invalid or uninitalized type.
- * @G_FILE_ATTRIBUTE_TYPE_STRING: a null terminated UTF8 string.
- * @G_FILE_ATTRIBUTE_TYPE_BYTE_STRING: a zero terminated string of non-zero bytes.
- * @G_FILE_ATTRIBUTE_TYPE_BOOLEAN: a boolean value.
- * @G_FILE_ATTRIBUTE_TYPE_UINT32: an unsigned 4-byte/32-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_INT32: a signed 4-byte/32-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_UINT64: an unsigned 8-byte/64-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_INT64: a signed 8-byte/64-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_OBJECT: a #GObject.
- * @G_FILE_ATTRIBUTE_TYPE_STRINGV: a %NULL terminated char **. Since 2.22
- *
- * The data types for file attributes.
- **/
-typedef enum {
-  G_FILE_ATTRIBUTE_TYPE_INVALID = 0,
-  G_FILE_ATTRIBUTE_TYPE_STRING,
-  G_FILE_ATTRIBUTE_TYPE_BYTE_STRING, /* zero terminated string of non-zero bytes */
-  G_FILE_ATTRIBUTE_TYPE_BOOLEAN,
-  G_FILE_ATTRIBUTE_TYPE_UINT32,
-  G_FILE_ATTRIBUTE_TYPE_INT32,
-  G_FILE_ATTRIBUTE_TYPE_UINT64,
-  G_FILE_ATTRIBUTE_TYPE_INT64,
-  G_FILE_ATTRIBUTE_TYPE_OBJECT,
-  G_FILE_ATTRIBUTE_TYPE_STRINGV
-} GFileAttributeType;
-
-
-/**
- * GFileAttributeInfoFlags:
- * @G_FILE_ATTRIBUTE_INFO_NONE: no flags set.
- * @G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE: copy the attribute values when the file is copied.
- * @G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED: copy the attribute values when the file is moved.
- *
- * Flags specifying the behaviour of an attribute.
- **/
-typedef enum {
-  G_FILE_ATTRIBUTE_INFO_NONE            = 0,
-  G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE  = (1 << 0),
-  G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED = (1 << 1)
-} GFileAttributeInfoFlags;
-
-
-/**
- * GFileAttributeStatus:
- * @G_FILE_ATTRIBUTE_STATUS_UNSET: Attribute value is unset (empty).
- * @G_FILE_ATTRIBUTE_STATUS_SET: Attribute value is set.
- * @G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING: Indicates an error in setting the value.
- *
- * Used by g_file_set_attributes_from_info() when setting file attributes.
- **/
-typedef enum {
-  G_FILE_ATTRIBUTE_STATUS_UNSET = 0,
-  G_FILE_ATTRIBUTE_STATUS_SET,
-  G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING
-} GFileAttributeStatus;
-
-
-/**
- * GFileQueryInfoFlags:
- * @G_FILE_QUERY_INFO_NONE: No flags set.
- * @G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS: Don't follow symlinks.
- *
- * Flags used when querying a #GFileInfo.
- */
-typedef enum {
-  G_FILE_QUERY_INFO_NONE              = 0,
-  G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS = (1 << 0)   /*< nick=nofollow-symlinks >*/
-} GFileQueryInfoFlags;
-
-
-/**
- * GFileCreateFlags:
- * @G_FILE_CREATE_NONE: No flags set.
- * @G_FILE_CREATE_PRIVATE: Create a file that can only be
- *    accessed by the current user.
- * @G_FILE_CREATE_REPLACE_DESTINATION: Replace the destination
- *    as if it didn't exist before. Don't try to keep any old
- *    permissions, replace instead of following links. This
- *    is generally useful if you're doing a "copy over"
- *    rather than a "save new version of" replace operation.
- *    You can think of it as "unlink destination" before
- *    writing to it, although the implementation may not
- *    be exactly like that. Since 2.20
- *
- * Flags used when an operation may create a file.
- */
-typedef enum {
-  G_FILE_CREATE_NONE    = 0,
-  G_FILE_CREATE_PRIVATE = (1 << 0),
-  G_FILE_CREATE_REPLACE_DESTINATION = (1 << 1)
-} GFileCreateFlags;
-
-/**
- * GFileMeasureFlags:
- * @G_FILE_MEASURE_NONE: No flags set.
- * @G_FILE_MEASURE_REPORT_ANY_ERROR: Report any error encountered
- *   while traversing the directory tree.  Normally errors are only
- *   reported for the toplevel file.
- * @G_FILE_MEASURE_APPARENT_SIZE: Tally usage based on apparent file
- *   sizes.  Normally, the block-size is used, if available, as this is a
- *   more accurate representation of disk space used.
- *   Compare with '<literal>du --apparent-size</literal>'.
- * @G_FILE_MEASURE_NO_XDEV: Do not cross mount point boundaries.
- *   Compare with '<literal>du -x</literal>'.
- *
- * Flags that can be used with g_file_measure_disk_usage().
- *
- * Since: 2.38
- **/
-typedef enum {
-  G_FILE_MEASURE_NONE                 = 0,
-  G_FILE_MEASURE_REPORT_ANY_ERROR     = (1 << 1),
-  G_FILE_MEASURE_APPARENT_SIZE        = (1 << 2),
-  G_FILE_MEASURE_NO_XDEV              = (1 << 3)
-} GFileMeasureFlags;
-
-/**
- * GMountMountFlags:
- * @G_MOUNT_MOUNT_NONE: No flags set.
- *
- * Flags used when mounting a mount.
- */
-typedef enum /*< flags >*/ {
-  G_MOUNT_MOUNT_NONE = 0
-} GMountMountFlags;
-
-
-/**
- * GMountUnmountFlags:
- * @G_MOUNT_UNMOUNT_NONE: No flags set.
- * @G_MOUNT_UNMOUNT_FORCE: Unmount even if there are outstanding
- *  file operations on the mount.
- *
- * Flags used when an unmounting a mount.
- */
-typedef enum {
-  G_MOUNT_UNMOUNT_NONE  = 0,
-  G_MOUNT_UNMOUNT_FORCE = (1 << 0)
-} GMountUnmountFlags;
-
-/**
- * GDriveStartFlags:
- * @G_DRIVE_START_NONE: No flags set.
- *
- * Flags used when starting a drive.
- *
- * Since: 2.22
- */
-typedef enum /*< flags >*/ {
-  G_DRIVE_START_NONE = 0
-} GDriveStartFlags;
-
-/**
- * GDriveStartStopType:
- * @G_DRIVE_START_STOP_TYPE_UNKNOWN: Unknown or drive doesn't support
- *    start/stop.
- * @G_DRIVE_START_STOP_TYPE_SHUTDOWN: The stop method will physically
- *    shut down the drive and e.g. power down the port the drive is
- *    attached to.
- * @G_DRIVE_START_STOP_TYPE_NETWORK: The start/stop methods are used
- *    for connecting/disconnect to the drive over the network.
- * @G_DRIVE_START_STOP_TYPE_MULTIDISK: The start/stop methods will
- *    assemble/disassemble a virtual drive from several physical
- *    drives.
- * @G_DRIVE_START_STOP_TYPE_PASSWORD: The start/stop methods will
- *    unlock/lock the disk (for example using the ATA <quote>SECURITY
- *    UNLOCK DEVICE</quote> command)
- *
- * Enumeration describing how a drive can be started/stopped.
- *
- * Since: 2.22
- */
-typedef enum {
-  G_DRIVE_START_STOP_TYPE_UNKNOWN,
-  G_DRIVE_START_STOP_TYPE_SHUTDOWN,
-  G_DRIVE_START_STOP_TYPE_NETWORK,
-  G_DRIVE_START_STOP_TYPE_MULTIDISK,
-  G_DRIVE_START_STOP_TYPE_PASSWORD
-} GDriveStartStopType;
-
-/**
- * GFileCopyFlags:
- * @G_FILE_COPY_NONE: No flags set.
- * @G_FILE_COPY_OVERWRITE: Overwrite any existing files
- * @G_FILE_COPY_BACKUP: Make a backup of any existing files.
- * @G_FILE_COPY_NOFOLLOW_SYMLINKS: Don't follow symlinks.
- * @G_FILE_COPY_ALL_METADATA: Copy all file metadata instead of just default set used for copy (see #GFileInfo).
- * @G_FILE_COPY_NO_FALLBACK_FOR_MOVE: Don't use copy and delete fallback if native move not supported.
- * @G_FILE_COPY_TARGET_DEFAULT_PERMS: Leaves target file with default perms, instead of setting the source file perms.
- *
- * Flags used when copying or moving files.
- */
-typedef enum {
-  G_FILE_COPY_NONE                 = 0,          /*< nick=none >*/
-  G_FILE_COPY_OVERWRITE            = (1 << 0),
-  G_FILE_COPY_BACKUP               = (1 << 1),
-  G_FILE_COPY_NOFOLLOW_SYMLINKS    = (1 << 2),
-  G_FILE_COPY_ALL_METADATA         = (1 << 3),
-  G_FILE_COPY_NO_FALLBACK_FOR_MOVE = (1 << 4),
-  G_FILE_COPY_TARGET_DEFAULT_PERMS = (1 << 5)
-} GFileCopyFlags;
-
-
-/**
- * GFileMonitorFlags:
- * @G_FILE_MONITOR_NONE: No flags set.
- * @G_FILE_MONITOR_WATCH_MOUNTS: Watch for mount events.
- * @G_FILE_MONITOR_SEND_MOVED: Pair DELETED and CREATED events caused
- *   by file renames (moves) and send a single G_FILE_MONITOR_EVENT_MOVED
- *   event instead (NB: not supported on all backends; the default
- *   behaviour -without specifying this flag- is to send single DELETED
- *   and CREATED events).
- * @G_FILE_MONITOR_WATCH_HARD_LINKS: Watch for changes to the file made
- *   via another hard link. Since 2.36.
- *
- * Flags used to set what a #GFileMonitor will watch for.
- */
-typedef enum {
-  G_FILE_MONITOR_NONE             = 0,
-  G_FILE_MONITOR_WATCH_MOUNTS     = (1 << 0),
-  G_FILE_MONITOR_SEND_MOVED       = (1 << 1),
-  G_FILE_MONITOR_WATCH_HARD_LINKS = (1 << 2)
-} GFileMonitorFlags;
-
-
-/**
- * GFileType:
- * @G_FILE_TYPE_UNKNOWN: File's type is unknown.
- * @G_FILE_TYPE_REGULAR: File handle represents a regular file.
- * @G_FILE_TYPE_DIRECTORY: File handle represents a directory.
- * @G_FILE_TYPE_SYMBOLIC_LINK: File handle represents a symbolic link
- *    (Unix systems).
- * @G_FILE_TYPE_SPECIAL: File is a "special" file, such as a socket, fifo,
- *    block device, or character device.
- * @G_FILE_TYPE_SHORTCUT: File is a shortcut (Windows systems).
- * @G_FILE_TYPE_MOUNTABLE: File is a mountable location.
- *
- * Indicates the file's on-disk type.
- **/
-typedef enum {
-  G_FILE_TYPE_UNKNOWN = 0,
-  G_FILE_TYPE_REGULAR,
-  G_FILE_TYPE_DIRECTORY,
-  G_FILE_TYPE_SYMBOLIC_LINK,
-  G_FILE_TYPE_SPECIAL, /* socket, fifo, blockdev, chardev */
-  G_FILE_TYPE_SHORTCUT,
-  G_FILE_TYPE_MOUNTABLE
-} GFileType;
-
-
-/**
- * GFilesystemPreviewType:
- * @G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS: Only preview files if user has explicitly requested it.
- * @G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL: Preview files if user has requested preview of "local" files.
- * @G_FILESYSTEM_PREVIEW_TYPE_NEVER: Never preview files.
- *
- * Indicates a hint from the file system whether files should be
- * previewed in a file manager. Returned as the value of the key
- * #G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW.
- **/
-typedef enum {
-  G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS = 0,
-  G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL,
-  G_FILESYSTEM_PREVIEW_TYPE_NEVER
-} GFilesystemPreviewType;
-
-
-/**
- * GFileMonitorEvent:
- * @G_FILE_MONITOR_EVENT_CHANGED: a file changed.
- * @G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: a hint that this was probably the last change in a set of changes.
- * @G_FILE_MONITOR_EVENT_DELETED: a file was deleted.
- * @G_FILE_MONITOR_EVENT_CREATED: a file was created.
- * @G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: a file attribute was changed.
- * @G_FILE_MONITOR_EVENT_PRE_UNMOUNT: the file location will soon be unmounted.
- * @G_FILE_MONITOR_EVENT_UNMOUNTED: the file location was unmounted.
- * @G_FILE_MONITOR_EVENT_MOVED: the file was moved.
- *
- * Specifies what type of event a monitor event is.
- **/
-typedef enum {
-  G_FILE_MONITOR_EVENT_CHANGED,
-  G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
-  G_FILE_MONITOR_EVENT_DELETED,
-  G_FILE_MONITOR_EVENT_CREATED,
-  G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED,
-  G_FILE_MONITOR_EVENT_PRE_UNMOUNT,
-  G_FILE_MONITOR_EVENT_UNMOUNTED,
-  G_FILE_MONITOR_EVENT_MOVED
-} GFileMonitorEvent;
-
-
-/* This enumeration conflicts with GIOError in giochannel.h. However,
- * that is only used as a return value in some deprecated functions.
- * So, we reuse the same prefix for the enumeration values, but call
- * the actual enumeration (which is rarely used) GIOErrorEnum.
- */
-/**
- * GIOErrorEnum:
- * @G_IO_ERROR_FAILED: Generic error condition for when any operation fails.
- * @G_IO_ERROR_NOT_FOUND: File not found.
- * @G_IO_ERROR_EXISTS: File already exists.
- * @G_IO_ERROR_IS_DIRECTORY: File is a directory.
- * @G_IO_ERROR_NOT_DIRECTORY: File is not a directory.
- * @G_IO_ERROR_NOT_EMPTY: File is a directory that isn't empty.
- * @G_IO_ERROR_NOT_REGULAR_FILE: File is not a regular file.
- * @G_IO_ERROR_NOT_SYMBOLIC_LINK: File is not a symbolic link.
- * @G_IO_ERROR_NOT_MOUNTABLE_FILE: File cannot be mounted.
- * @G_IO_ERROR_FILENAME_TOO_LONG: Filename is too many characters.
- * @G_IO_ERROR_INVALID_FILENAME: Filename is invalid or contains invalid characters.
- * @G_IO_ERROR_TOO_MANY_LINKS: File contains too many symbolic links.
- * @G_IO_ERROR_NO_SPACE: No space left on drive.
- * @G_IO_ERROR_INVALID_ARGUMENT: Invalid argument.
- * @G_IO_ERROR_PERMISSION_DENIED: Permission denied.
- * @G_IO_ERROR_NOT_SUPPORTED: Operation not supported for the current backend.
- * @G_IO_ERROR_NOT_MOUNTED: File isn't mounted.
- * @G_IO_ERROR_ALREADY_MOUNTED: File is already mounted.
- * @G_IO_ERROR_CLOSED: File was closed.
- * @G_IO_ERROR_CANCELLED: Operation was cancelled. See #GCancellable.
- * @G_IO_ERROR_PENDING: Operations are still pending.
- * @G_IO_ERROR_READ_ONLY: File is read only.
- * @G_IO_ERROR_CANT_CREATE_BACKUP: Backup couldn't be created.
- * @G_IO_ERROR_WRONG_ETAG: File's Entity Tag was incorrect.
- * @G_IO_ERROR_TIMED_OUT: Operation timed out.
- * @G_IO_ERROR_WOULD_RECURSE: Operation would be recursive.
- * @G_IO_ERROR_BUSY: File is busy.
- * @G_IO_ERROR_WOULD_BLOCK: Operation would block.
- * @G_IO_ERROR_HOST_NOT_FOUND: Host couldn't be found (remote operations).
- * @G_IO_ERROR_WOULD_MERGE: Operation would merge files.
- * @G_IO_ERROR_FAILED_HANDLED: Operation failed and a helper program has
- *     already interacted with the user. Do not display any error dialog.
- * @G_IO_ERROR_TOO_MANY_OPEN_FILES: The current process has too many files
- *     open and can't open any more. Duplicate descriptors do count toward
- *     this limit. Since 2.20
- * @G_IO_ERROR_NOT_INITIALIZED: The object has not been initialized. Since 2.22
- * @G_IO_ERROR_ADDRESS_IN_USE: The requested address is already in use. Since 2.22
- * @G_IO_ERROR_PARTIAL_INPUT: Need more input to finish operation. Since 2.24
- * @G_IO_ERROR_INVALID_DATA: The input data was invalid. Since 2.24
- * @G_IO_ERROR_DBUS_ERROR: A remote object generated an error that
- *     doesn't correspond to a locally registered #GError error
- *     domain. Use g_dbus_error_get_remote_error() to extract the D-Bus
- *     error name and g_dbus_error_strip_remote_error() to fix up the
- *     message so it matches what was received on the wire. Since 2.26.
- * @G_IO_ERROR_HOST_UNREACHABLE: Host unreachable. Since 2.26
- * @G_IO_ERROR_NETWORK_UNREACHABLE: Network unreachable. Since 2.26
- * @G_IO_ERROR_CONNECTION_REFUSED: Connection refused. Since 2.26
- * @G_IO_ERROR_PROXY_FAILED: Connection to proxy server failed. Since 2.26
- * @G_IO_ERROR_PROXY_AUTH_FAILED: Proxy authentication failed. Since 2.26
- * @G_IO_ERROR_PROXY_NEED_AUTH: Proxy server needs authentication. Since 2.26
- * @G_IO_ERROR_PROXY_NOT_ALLOWED: Proxy connection is not allowed by ruleset.
- *     Since 2.26
- * @G_IO_ERROR_BROKEN_PIPE: Broken pipe. Since 2.36
- *
- * Error codes returned by GIO functions.
- *
- **/
-typedef enum {
-  G_IO_ERROR_FAILED,
-  G_IO_ERROR_NOT_FOUND,
-  G_IO_ERROR_EXISTS,
-  G_IO_ERROR_IS_DIRECTORY,
-  G_IO_ERROR_NOT_DIRECTORY,
-  G_IO_ERROR_NOT_EMPTY,
-  G_IO_ERROR_NOT_REGULAR_FILE,
-  G_IO_ERROR_NOT_SYMBOLIC_LINK,
-  G_IO_ERROR_NOT_MOUNTABLE_FILE,
-  G_IO_ERROR_FILENAME_TOO_LONG,
-  G_IO_ERROR_INVALID_FILENAME,
-  G_IO_ERROR_TOO_MANY_LINKS,
-  G_IO_ERROR_NO_SPACE,
-  G_IO_ERROR_INVALID_ARGUMENT,
-  G_IO_ERROR_PERMISSION_DENIED,
-  G_IO_ERROR_NOT_SUPPORTED,
-  G_IO_ERROR_NOT_MOUNTED,
-  G_IO_ERROR_ALREADY_MOUNTED,
-  G_IO_ERROR_CLOSED,
-  G_IO_ERROR_CANCELLED,
-  G_IO_ERROR_PENDING,
-  G_IO_ERROR_READ_ONLY,
-  G_IO_ERROR_CANT_CREATE_BACKUP,
-  G_IO_ERROR_WRONG_ETAG,
-  G_IO_ERROR_TIMED_OUT,
-  G_IO_ERROR_WOULD_RECURSE,
-  G_IO_ERROR_BUSY,
-  G_IO_ERROR_WOULD_BLOCK,
-  G_IO_ERROR_HOST_NOT_FOUND,
-  G_IO_ERROR_WOULD_MERGE,
-  G_IO_ERROR_FAILED_HANDLED,
-  G_IO_ERROR_TOO_MANY_OPEN_FILES,
-  G_IO_ERROR_NOT_INITIALIZED,
-  G_IO_ERROR_ADDRESS_IN_USE,
-  G_IO_ERROR_PARTIAL_INPUT,
-  G_IO_ERROR_INVALID_DATA,
-  G_IO_ERROR_DBUS_ERROR,
-  G_IO_ERROR_HOST_UNREACHABLE,
-  G_IO_ERROR_NETWORK_UNREACHABLE,
-  G_IO_ERROR_CONNECTION_REFUSED,
-  G_IO_ERROR_PROXY_FAILED,
-  G_IO_ERROR_PROXY_AUTH_FAILED,
-  G_IO_ERROR_PROXY_NEED_AUTH,
-  G_IO_ERROR_PROXY_NOT_ALLOWED,
-  G_IO_ERROR_BROKEN_PIPE
-} GIOErrorEnum;
-
-
-/**
- * GAskPasswordFlags:
- * @G_ASK_PASSWORD_NEED_PASSWORD: operation requires a password.
- * @G_ASK_PASSWORD_NEED_USERNAME: operation requires a username.
- * @G_ASK_PASSWORD_NEED_DOMAIN: operation requires a domain.
- * @G_ASK_PASSWORD_SAVING_SUPPORTED: operation supports saving settings.
- * @G_ASK_PASSWORD_ANONYMOUS_SUPPORTED: operation supports anonymous users.
- *
- * #GAskPasswordFlags are used to request specific information from the
- * user, or to notify the user of their choices in an authentication
- * situation.
- **/
-typedef enum {
-  G_ASK_PASSWORD_NEED_PASSWORD       = (1 << 0),
-  G_ASK_PASSWORD_NEED_USERNAME       = (1 << 1),
-  G_ASK_PASSWORD_NEED_DOMAIN         = (1 << 2),
-  G_ASK_PASSWORD_SAVING_SUPPORTED    = (1 << 3),
-  G_ASK_PASSWORD_ANONYMOUS_SUPPORTED = (1 << 4)
-} GAskPasswordFlags;
-
-
-/**
- * GPasswordSave:
- * @G_PASSWORD_SAVE_NEVER: never save a password.
- * @G_PASSWORD_SAVE_FOR_SESSION: save a password for the session.
- * @G_PASSWORD_SAVE_PERMANENTLY: save a password permanently.
- *
- * #GPasswordSave is used to indicate the lifespan of a saved password.
- *
- * #Gvfs stores passwords in the Gnome keyring when this flag allows it
- * to, and later retrieves it again from there.
- **/
-typedef enum {
-  G_PASSWORD_SAVE_NEVER,
-  G_PASSWORD_SAVE_FOR_SESSION,
-  G_PASSWORD_SAVE_PERMANENTLY
-} GPasswordSave;
-
-
-/**
- * GMountOperationResult:
- * @G_MOUNT_OPERATION_HANDLED: The request was fulfilled and the
- *     user specified data is now available
- * @G_MOUNT_OPERATION_ABORTED: The user requested the mount operation
- *     to be aborted
- * @G_MOUNT_OPERATION_UNHANDLED: The request was unhandled (i.e. not
- *     implemented)
- *
- * #GMountOperationResult is returned as a result when a request for
- * information is send by the mounting operation.
- **/
-typedef enum {
-  G_MOUNT_OPERATION_HANDLED,
-  G_MOUNT_OPERATION_ABORTED,
-  G_MOUNT_OPERATION_UNHANDLED
-} GMountOperationResult;
-
-
-/**
- * GOutputStreamSpliceFlags:
- * @G_OUTPUT_STREAM_SPLICE_NONE: Do not close either stream.
- * @G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE: Close the source stream after
- *     the splice.
- * @G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET: Close the target stream after
- *     the splice.
- *
- * GOutputStreamSpliceFlags determine how streams should be spliced.
- **/
-typedef enum {
-  G_OUTPUT_STREAM_SPLICE_NONE         = 0,
-  G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE = (1 << 0),
-  G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET = (1 << 1)
-} GOutputStreamSpliceFlags;
-
-
-/**
- * GIOStreamSpliceFlags:
- * @G_IO_STREAM_SPLICE_NONE: Do not close either stream.
- * @G_IO_STREAM_SPLICE_CLOSE_STREAM1: Close the first stream after
- *     the splice.
- * @G_IO_STREAM_SPLICE_CLOSE_STREAM2: Close the second stream after
- *     the splice.
- * @G_IO_STREAM_SPLICE_WAIT_FOR_BOTH: Wait for both splice operations to finish
- *     before calling the callback.
- *
- * GIOStreamSpliceFlags determine how streams should be spliced.
- *
- * Since: 2.28
- **/
-typedef enum {
-  G_IO_STREAM_SPLICE_NONE          = 0,
-  G_IO_STREAM_SPLICE_CLOSE_STREAM1 = (1 << 0),
-  G_IO_STREAM_SPLICE_CLOSE_STREAM2 = (1 << 1),
-  G_IO_STREAM_SPLICE_WAIT_FOR_BOTH = (1 << 2)
-} GIOStreamSpliceFlags;
-
-/**
- * GEmblemOrigin:
- * @G_EMBLEM_ORIGIN_UNKNOWN: Emblem of unknown origin
- * @G_EMBLEM_ORIGIN_DEVICE: Emblem adds device-specific information
- * @G_EMBLEM_ORIGIN_LIVEMETADATA: Emblem depicts live metadata, such as "readonly"
- * @G_EMBLEM_ORIGIN_TAG: Emblem comes from a user-defined tag, e.g. set by nautilus (in the future)
- *
- * GEmblemOrigin is used to add information about the origin of the emblem
- * to #GEmblem.
- *
- * Since: 2.18
- */
-typedef enum  {
-  G_EMBLEM_ORIGIN_UNKNOWN,
-  G_EMBLEM_ORIGIN_DEVICE,
-  G_EMBLEM_ORIGIN_LIVEMETADATA,
-  G_EMBLEM_ORIGIN_TAG
-} GEmblemOrigin;
-
-/**
- * GResolverError:
- * @G_RESOLVER_ERROR_NOT_FOUND: the requested name/address/service was not
- *     found
- * @G_RESOLVER_ERROR_TEMPORARY_FAILURE: the requested information could not
- *     be looked up due to a network error or similar problem
- * @G_RESOLVER_ERROR_INTERNAL: unknown error
- *
- * An error code used with %G_RESOLVER_ERROR in a #GError returned
- * from a #GResolver routine.
- *
- * Since: 2.22
- */
-typedef enum {
-  G_RESOLVER_ERROR_NOT_FOUND,
-  G_RESOLVER_ERROR_TEMPORARY_FAILURE,
-  G_RESOLVER_ERROR_INTERNAL
-} GResolverError;
-
-/**
- * GResolverRecordType:
- * @G_RESOLVER_RECORD_SRV: lookup DNS SRV records for a domain
- * @G_RESOLVER_RECORD_MX: lookup DNS MX records for a domain
- * @G_RESOLVER_RECORD_TXT: lookup DNS TXT records for a name
- * @G_RESOLVER_RECORD_SOA: lookup DNS SOA records for a zone
- * @G_RESOLVER_RECORD_NS: lookup DNS NS records for a domain
- *
- * The type of record that g_resolver_lookup_records() or
- * g_resolver_lookup_records_async() should retrieve. The records are returned
- * as lists of #GVariant tuples. Each record type has different values in
- * the variant tuples returned.
- *
- * %G_RESOLVER_RECORD_SRV records are returned as variants with the signature
- * '(qqqs)', containing a guint16 with the priority, a guint16 with the
- * weight, a guint16 with the port, and a string of the hostname.
- *
- * %G_RESOLVER_RECORD_MX records are returned as variants with the signature
- * '(qs)', representing a guint16 with the preference, and a string containing
- * the mail exchanger hostname.
- *
- * %G_RESOLVER_RECORD_TXT records are returned as variants with the signature
- * '(as)', representing an array of the strings in the text record.
- *
- * %G_RESOLVER_RECORD_SOA records are returned as variants with the signature
- * '(ssuuuuu)', representing a string containing the primary name server, a
- * string containing the administrator, the serial as a guint32, the refresh
- * interval as guint32, the retry interval as a guint32, the expire timeout
- * as a guint32, and the ttl as a guint32.
- *
- * %G_RESOLVER_RECORD_NS records are returned as variants with the signature
- * '(s)', representing a string of the hostname of the name server.
- *
- * Since: 2.34
- */
-typedef enum {
-  G_RESOLVER_RECORD_SRV = 1,
-  G_RESOLVER_RECORD_MX,
-  G_RESOLVER_RECORD_TXT,
-  G_RESOLVER_RECORD_SOA,
-  G_RESOLVER_RECORD_NS
-} GResolverRecordType;
-
-/**
- * GResourceError:
- * @G_RESOURCE_ERROR_NOT_FOUND: no file was found at the requested path
- * @G_RESOURCE_ERROR_INTERNAL: unknown error
- *
- * An error code used with %G_RESOURCE_ERROR in a #GError returned
- * from a #GResource routine.
- *
- * Since: 2.32
- */
-typedef enum {
-  G_RESOURCE_ERROR_NOT_FOUND,
-  G_RESOURCE_ERROR_INTERNAL
-} GResourceError;
-
-/**
- * GResourceFlags:
- * @G_RESOURCE_FLAGS_NONE: No flags set.
- * @G_RESOURCE_FLAGS_COMPRESSED: The file is compressed.
- *
- * GResourceFlags give information about a particular file inside a resource
- * bundle.
- * 
- * Since: 2.32
- **/
-typedef enum {
-  G_RESOURCE_FLAGS_NONE       = 0,
-  G_RESOURCE_FLAGS_COMPRESSED = (1<<0)
-} GResourceFlags;
-
-/**
- * GResourceLookupFlags:
- * @G_RESOURCE_LOOKUP_FLAGS_NONE: No flags set.
- *
- * GResourceLookupFlags determine how resource path lookups are handled.
- * 
- * Since: 2.32
- **/
-typedef enum /*< flags >*/ {
-  G_RESOURCE_LOOKUP_FLAGS_NONE       = 0
-} GResourceLookupFlags;
-
-/**
- * GSocketFamily:
- * @G_SOCKET_FAMILY_INVALID: no address family
- * @G_SOCKET_FAMILY_IPV4: the IPv4 family
- * @G_SOCKET_FAMILY_IPV6: the IPv6 family
- * @G_SOCKET_FAMILY_UNIX: the UNIX domain family
- *
- * The protocol family of a #GSocketAddress. (These values are
- * identical to the system defines %AF_INET, %AF_INET6 and %AF_UNIX,
- * if available.)
- *
- * Since: 2.22
- */
-typedef enum {
-  G_SOCKET_FAMILY_INVALID,
-  G_SOCKET_FAMILY_UNIX = GLIB_SYSDEF_AF_UNIX,
-  G_SOCKET_FAMILY_IPV4 = GLIB_SYSDEF_AF_INET,
-  G_SOCKET_FAMILY_IPV6 = GLIB_SYSDEF_AF_INET6
-} GSocketFamily;
-
-/**
- * GSocketType:
- * @G_SOCKET_TYPE_INVALID: Type unknown or wrong
- * @G_SOCKET_TYPE_STREAM: Reliable connection-based byte streams (e.g. TCP).
- * @G_SOCKET_TYPE_DATAGRAM: Connectionless, unreliable datagram passing.
- *     (e.g. UDP)
- * @G_SOCKET_TYPE_SEQPACKET: Reliable connection-based passing of datagrams
- *     of fixed maximum length (e.g. SCTP).
- *
- * Flags used when creating a #GSocket. Some protocols may not implement
- * all the socket types.
- *
- * Since: 2.22
- */
-typedef enum
-{
-  G_SOCKET_TYPE_INVALID,
-  G_SOCKET_TYPE_STREAM,
-  G_SOCKET_TYPE_DATAGRAM,
-  G_SOCKET_TYPE_SEQPACKET
-} GSocketType;
-
-/**
- * GSocketMsgFlags:
- * @G_SOCKET_MSG_NONE: No flags.
- * @G_SOCKET_MSG_OOB: Request to send/receive out of band data.
- * @G_SOCKET_MSG_PEEK: Read data from the socket without removing it from
- *     the queue.
- * @G_SOCKET_MSG_DONTROUTE: Don't use a gateway to send out the packet,
- *     only send to hosts on directly connected networks.
- *
- * Flags used in g_socket_receive_message() and g_socket_send_message().
- * The flags listed in the enum are some commonly available flags, but the
- * values used for them are the same as on the platform, and any other flags
- * are passed in/out as is. So to use a platform specific flag, just include
- * the right system header and pass in the flag.
- *
- * Since: 2.22
- */
-typedef enum /*< flags >*/
-{
-  G_SOCKET_MSG_NONE,
-  G_SOCKET_MSG_OOB = GLIB_SYSDEF_MSG_OOB,
-  G_SOCKET_MSG_PEEK = GLIB_SYSDEF_MSG_PEEK,
-  G_SOCKET_MSG_DONTROUTE = GLIB_SYSDEF_MSG_DONTROUTE
-} GSocketMsgFlags;
-
-/**
- * GSocketProtocol:
- * @G_SOCKET_PROTOCOL_UNKNOWN: The protocol type is unknown
- * @G_SOCKET_PROTOCOL_DEFAULT: The default protocol for the family/type
- * @G_SOCKET_PROTOCOL_TCP: TCP over IP
- * @G_SOCKET_PROTOCOL_UDP: UDP over IP
- * @G_SOCKET_PROTOCOL_SCTP: SCTP over IP
- *
- * A protocol identifier is specified when creating a #GSocket, which is a
- * family/type specific identifier, where 0 means the default protocol for
- * the particular family/type.
- *
- * This enum contains a set of commonly available and used protocols. You
- * can also pass any other identifiers handled by the platform in order to
- * use protocols not listed here.
- *
- * Since: 2.22
- */
-typedef enum {
-  G_SOCKET_PROTOCOL_UNKNOWN = -1,
-  G_SOCKET_PROTOCOL_DEFAULT = 0,
-  G_SOCKET_PROTOCOL_TCP     = 6,
-  G_SOCKET_PROTOCOL_UDP     = 17,
-  G_SOCKET_PROTOCOL_SCTP    = 132
-} GSocketProtocol;
-
-/**
- * GZlibCompressorFormat:
- * @G_ZLIB_COMPRESSOR_FORMAT_ZLIB: deflate compression with zlib header
- * @G_ZLIB_COMPRESSOR_FORMAT_GZIP: gzip file format
- * @G_ZLIB_COMPRESSOR_FORMAT_RAW: deflate compression with no header
- *
- * Used to select the type of data format to use for #GZlibDecompressor
- * and #GZlibCompressor.
- *
- * Since: 2.24
- */
-typedef enum {
-  G_ZLIB_COMPRESSOR_FORMAT_ZLIB,
-  G_ZLIB_COMPRESSOR_FORMAT_GZIP,
-  G_ZLIB_COMPRESSOR_FORMAT_RAW
-} GZlibCompressorFormat;
-
-/**
- * GUnixSocketAddressType:
- * @G_UNIX_SOCKET_ADDRESS_INVALID: invalid
- * @G_UNIX_SOCKET_ADDRESS_ANONYMOUS: anonymous
- * @G_UNIX_SOCKET_ADDRESS_PATH: a filesystem path
- * @G_UNIX_SOCKET_ADDRESS_ABSTRACT: an abstract name
- * @G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED: an abstract name, 0-padded
- *   to the full length of a unix socket name
- *
- * The type of name used by a #GUnixSocketAddress.
- * %G_UNIX_SOCKET_ADDRESS_PATH indicates a traditional unix domain
- * socket bound to a filesystem path. %G_UNIX_SOCKET_ADDRESS_ANONYMOUS
- * indicates a socket not bound to any name (eg, a client-side socket,
- * or a socket created with socketpair()).
- *
- * For abstract sockets, there are two incompatible ways of naming
- * them; the man pages suggest using the entire <literal>struct
- * sockaddr_un</literal> as the name, padding the unused parts of the
- * %sun_path field with zeroes; this corresponds to
- * %G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED. However, many programs
- * instead just use a portion of %sun_path, and pass an appropriate
- * smaller length to bind() or connect(). This is
- * %G_UNIX_SOCKET_ADDRESS_ABSTRACT.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_UNIX_SOCKET_ADDRESS_INVALID,
-  G_UNIX_SOCKET_ADDRESS_ANONYMOUS,
-  G_UNIX_SOCKET_ADDRESS_PATH,
-  G_UNIX_SOCKET_ADDRESS_ABSTRACT,
-  G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED
-} GUnixSocketAddressType;
-
-/**
- * GBusType:
- * @G_BUS_TYPE_STARTER: An alias for the message bus that activated the process, if any.
- * @G_BUS_TYPE_NONE: Not a message bus.
- * @G_BUS_TYPE_SYSTEM: The system-wide message bus.
- * @G_BUS_TYPE_SESSION: The login session message bus.
- *
- * An enumeration for well-known message buses.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_BUS_TYPE_STARTER = -1,
-  G_BUS_TYPE_NONE = 0,
-  G_BUS_TYPE_SYSTEM  = 1,
-  G_BUS_TYPE_SESSION = 2
-} GBusType;
-
-/**
- * GBusNameOwnerFlags:
- * @G_BUS_NAME_OWNER_FLAGS_NONE: No flags set.
- * @G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT: Allow another message bus connection to claim the name.
- * @G_BUS_NAME_OWNER_FLAGS_REPLACE: If another message bus connection owns the name and have
- * specified #G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT, then take the name from the other connection.
- *
- * Flags used in g_bus_own_name().
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_BUS_NAME_OWNER_FLAGS_NONE = 0,                    /*< nick=none >*/
-  G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT = (1<<0),  /*< nick=allow-replacement >*/
-  G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1)            /*< nick=replace >*/
-} GBusNameOwnerFlags;
-
-/**
- * GBusNameWatcherFlags:
- * @G_BUS_NAME_WATCHER_FLAGS_NONE: No flags set.
- * @G_BUS_NAME_WATCHER_FLAGS_AUTO_START: If no-one owns the name when
- * beginning to watch the name, ask the bus to launch an owner for the
- * name.
- *
- * Flags used in g_bus_watch_name().
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_BUS_NAME_WATCHER_FLAGS_NONE = 0,
-  G_BUS_NAME_WATCHER_FLAGS_AUTO_START = (1<<0)
-} GBusNameWatcherFlags;
-
-/**
- * GDBusProxyFlags:
- * @G_DBUS_PROXY_FLAGS_NONE: No flags set.
- * @G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES: Don't load properties.
- * @G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS: Don't connect to signals on the remote object.
- * @G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START: If not set and the proxy if for a well-known name,
- * then request the bus to launch an owner for the name if no-one owns the name. This flag can
- * only be used in proxies for well-known names.
- * @G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES: If set, the property value for any <emphasis>invalidated property</emphasis> will be (asynchronously) retrieved upon receiving the <ulink url="http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-properties">PropertiesChanged</ulink> D-Bus signal and the property will not cause emission of the #GDBusProxy::g-properties-changed signal. When the value is received the #GDBusProxy::g-properties-changed signal is emitted for the property along with the retrieved value. Since 2.32.
- *
- * Flags used when constructing an instance of a #GDBusProxy derived class.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_PROXY_FLAGS_NONE = 0,
-  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES = (1<<0),
-  G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1),
-  G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START = (1<<2),
-  G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES = (1<<3)
-} GDBusProxyFlags;
-
-/**
- * GDBusError:
- * @G_DBUS_ERROR_FAILED:
- * A generic error; "something went wrong" - see the error message for
- * more.
- * @G_DBUS_ERROR_NO_MEMORY:
- * There was not enough memory to complete an operation.
- * @G_DBUS_ERROR_SERVICE_UNKNOWN:
- * The bus doesn't know how to launch a service to supply the bus name
- * you wanted.
- * @G_DBUS_ERROR_NAME_HAS_NO_OWNER:
- * The bus name you referenced doesn't exist (i.e. no application owns
- * it).
- * @G_DBUS_ERROR_NO_REPLY:
- * No reply to a message expecting one, usually means a timeout occurred.
- * @G_DBUS_ERROR_IO_ERROR:
- * Something went wrong reading or writing to a socket, for example.
- * @G_DBUS_ERROR_BAD_ADDRESS:
- * A D-Bus bus address was malformed.
- * @G_DBUS_ERROR_NOT_SUPPORTED:
- * Requested operation isn't supported (like ENOSYS on UNIX).
- * @G_DBUS_ERROR_LIMITS_EXCEEDED:
- * Some limited resource is exhausted.
- * @G_DBUS_ERROR_ACCESS_DENIED:
- * Security restrictions don't allow doing what you're trying to do.
- * @G_DBUS_ERROR_AUTH_FAILED:
- * Authentication didn't work.
- * @G_DBUS_ERROR_NO_SERVER:
- * Unable to connect to server (probably caused by ECONNREFUSED on a
- * socket).
- * @G_DBUS_ERROR_TIMEOUT:
- * Certain timeout errors, possibly ETIMEDOUT on a socket.  Note that
- * %G_DBUS_ERROR_NO_REPLY is used for message reply timeouts. Warning:
- * this is confusingly-named given that %G_DBUS_ERROR_TIMED_OUT also
- * exists. We can't fix it for compatibility reasons so just be
- * careful.
- * @G_DBUS_ERROR_NO_NETWORK:
- * No network access (probably ENETUNREACH on a socket).
- * @G_DBUS_ERROR_ADDRESS_IN_USE:
- * Can't bind a socket since its address is in use (i.e. EADDRINUSE).
- * @G_DBUS_ERROR_DISCONNECTED:
- * The connection is disconnected and you're trying to use it.
- * @G_DBUS_ERROR_INVALID_ARGS:
- * Invalid arguments passed to a method call.
- * @G_DBUS_ERROR_FILE_NOT_FOUND:
- * Missing file.
- * @G_DBUS_ERROR_FILE_EXISTS:
- * Existing file and the operation you're using does not silently overwrite.
- * @G_DBUS_ERROR_UNKNOWN_METHOD:
- * Method name you invoked isn't known by the object you invoked it on.
- * @G_DBUS_ERROR_TIMED_OUT:
- * Certain timeout errors, e.g. while starting a service. Warning: this is
- * confusingly-named given that %G_DBUS_ERROR_TIMEOUT also exists. We
- * can't fix it for compatibility reasons so just be careful.
- * @G_DBUS_ERROR_MATCH_RULE_NOT_FOUND:
- * Tried to remove or modify a match rule that didn't exist.
- * @G_DBUS_ERROR_MATCH_RULE_INVALID:
- * The match rule isn't syntactically valid.
- * @G_DBUS_ERROR_SPAWN_EXEC_FAILED:
- * While starting a new process, the exec() call failed.
- * @G_DBUS_ERROR_SPAWN_FORK_FAILED:
- * While starting a new process, the fork() call failed.
- * @G_DBUS_ERROR_SPAWN_CHILD_EXITED:
- * While starting a new process, the child exited with a status code.
- * @G_DBUS_ERROR_SPAWN_CHILD_SIGNALED:
- * While starting a new process, the child exited on a signal.
- * @G_DBUS_ERROR_SPAWN_FAILED:
- * While starting a new process, something went wrong.
- * @G_DBUS_ERROR_SPAWN_SETUP_FAILED:
- * We failed to setup the environment correctly.
- * @G_DBUS_ERROR_SPAWN_CONFIG_INVALID:
- * We failed to setup the config parser correctly.
- * @G_DBUS_ERROR_SPAWN_SERVICE_INVALID:
- * Bus name was not valid.
- * @G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND:
- * Service file not found in system-services directory.
- * @G_DBUS_ERROR_SPAWN_PERMISSIONS_INVALID:
- * Permissions are incorrect on the setuid helper.
- * @G_DBUS_ERROR_SPAWN_FILE_INVALID:
- * Service file invalid (Name, User or Exec missing).
- * @G_DBUS_ERROR_SPAWN_NO_MEMORY:
- * Tried to get a UNIX process ID and it wasn't available.
- * @G_DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN:
- * Tried to get a UNIX process ID and it wasn't available.
- * @G_DBUS_ERROR_INVALID_SIGNATURE:
- * A type signature is not valid.
- * @G_DBUS_ERROR_INVALID_FILE_CONTENT:
- * A file contains invalid syntax or is otherwise broken.
- * @G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
- * Asked for SELinux security context and it wasn't available.
- * @G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN:
- * Asked for ADT audit data and it wasn't available.
- * @G_DBUS_ERROR_OBJECT_PATH_IN_USE:
- * There's already an object with the requested object path.
- *
- * Error codes for the %G_DBUS_ERROR error domain.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  /* Well-known errors in the org.freedesktop.DBus.Error namespace */
-  G_DBUS_ERROR_FAILED,                           /* org.freedesktop.DBus.Error.Failed */
-  G_DBUS_ERROR_NO_MEMORY,                        /* org.freedesktop.DBus.Error.NoMemory */
-  G_DBUS_ERROR_SERVICE_UNKNOWN,                  /* org.freedesktop.DBus.Error.ServiceUnknown */
-  G_DBUS_ERROR_NAME_HAS_NO_OWNER,                /* org.freedesktop.DBus.Error.NameHasNoOwner */
-  G_DBUS_ERROR_NO_REPLY,                         /* org.freedesktop.DBus.Error.NoReply */
-  G_DBUS_ERROR_IO_ERROR,                         /* org.freedesktop.DBus.Error.IOError */
-  G_DBUS_ERROR_BAD_ADDRESS,                      /* org.freedesktop.DBus.Error.BadAddress */
-  G_DBUS_ERROR_NOT_SUPPORTED,                    /* org.freedesktop.DBus.Error.NotSupported */
-  G_DBUS_ERROR_LIMITS_EXCEEDED,                  /* org.freedesktop.DBus.Error.LimitsExceeded */
-  G_DBUS_ERROR_ACCESS_DENIED,                    /* org.freedesktop.DBus.Error.AccessDenied */
-  G_DBUS_ERROR_AUTH_FAILED,                      /* org.freedesktop.DBus.Error.AuthFailed */
-  G_DBUS_ERROR_NO_SERVER,                        /* org.freedesktop.DBus.Error.NoServer */
-  G_DBUS_ERROR_TIMEOUT,                          /* org.freedesktop.DBus.Error.Timeout */
-  G_DBUS_ERROR_NO_NETWORK,                       /* org.freedesktop.DBus.Error.NoNetwork */
-  G_DBUS_ERROR_ADDRESS_IN_USE,                   /* org.freedesktop.DBus.Error.AddressInUse */
-  G_DBUS_ERROR_DISCONNECTED,                     /* org.freedesktop.DBus.Error.Disconnected */
-  G_DBUS_ERROR_INVALID_ARGS,                     /* org.freedesktop.DBus.Error.InvalidArgs */
-  G_DBUS_ERROR_FILE_NOT_FOUND,                   /* org.freedesktop.DBus.Error.FileNotFound */
-  G_DBUS_ERROR_FILE_EXISTS,                      /* org.freedesktop.DBus.Error.FileExists */
-  G_DBUS_ERROR_UNKNOWN_METHOD,                   /* org.freedesktop.DBus.Error.UnknownMethod */
-  G_DBUS_ERROR_TIMED_OUT,                        /* org.freedesktop.DBus.Error.TimedOut */
-  G_DBUS_ERROR_MATCH_RULE_NOT_FOUND,             /* org.freedesktop.DBus.Error.MatchRuleNotFound */
-  G_DBUS_ERROR_MATCH_RULE_INVALID,               /* org.freedesktop.DBus.Error.MatchRuleInvalid */
-  G_DBUS_ERROR_SPAWN_EXEC_FAILED,                /* org.freedesktop.DBus.Error.Spawn.ExecFailed */
-  G_DBUS_ERROR_SPAWN_FORK_FAILED,                /* org.freedesktop.DBus.Error.Spawn.ForkFailed */
-  G_DBUS_ERROR_SPAWN_CHILD_EXITED,               /* org.freedesktop.DBus.Error.Spawn.ChildExited */
-  G_DBUS_ERROR_SPAWN_CHILD_SIGNALED,             /* org.freedesktop.DBus.Error.Spawn.ChildSignaled */
-  G_DBUS_ERROR_SPAWN_FAILED,                     /* org.freedesktop.DBus.Error.Spawn.Failed */
-  G_DBUS_ERROR_SPAWN_SETUP_FAILED,               /* org.freedesktop.DBus.Error.Spawn.FailedToSetup */
-  G_DBUS_ERROR_SPAWN_CONFIG_INVALID,             /* org.freedesktop.DBus.Error.Spawn.ConfigInvalid */
-  G_DBUS_ERROR_SPAWN_SERVICE_INVALID,            /* org.freedesktop.DBus.Error.Spawn.ServiceNotValid */
-  G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND,          /* org.freedesktop.DBus.Error.Spawn.ServiceNotFound */
-  G_DBUS_ERROR_SPAWN_PERMISSIONS_INVALID,        /* org.freedesktop.DBus.Error.Spawn.PermissionsInvalid */
-  G_DBUS_ERROR_SPAWN_FILE_INVALID,               /* org.freedesktop.DBus.Error.Spawn.FileInvalid */
-  G_DBUS_ERROR_SPAWN_NO_MEMORY,                  /* org.freedesktop.DBus.Error.Spawn.NoMemory */
-  G_DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN,          /* org.freedesktop.DBus.Error.UnixProcessIdUnknown */
-  G_DBUS_ERROR_INVALID_SIGNATURE,                /* org.freedesktop.DBus.Error.InvalidSignature */
-  G_DBUS_ERROR_INVALID_FILE_CONTENT,             /* org.freedesktop.DBus.Error.InvalidFileContent */
-  G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, /* org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown */
-  G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN,           /* org.freedesktop.DBus.Error.AdtAuditDataUnknown */
-  G_DBUS_ERROR_OBJECT_PATH_IN_USE                /* org.freedesktop.DBus.Error.ObjectPathInUse */
-} GDBusError;
-/* Remember to update g_dbus_error_quark() in gdbuserror.c if you extend this enumeration */
-
-/**
- * GDBusConnectionFlags:
- * @G_DBUS_CONNECTION_FLAGS_NONE: No flags set.
- * @G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT: Perform authentication against server.
- * @G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER: Perform authentication against client.
- * @G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS: When
- * authenticating as a server, allow the anonymous authentication
- * method.
- * @G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION: Pass this flag if connecting to a peer that is a
- * message bus. This means that the Hello() method will be invoked as part of the connection setup.
- * @G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING: If set, processing of D-Bus messages is
- * delayed until g_dbus_connection_start_message_processing() is called.
- *
- * Flags used when creating a new #GDBusConnection.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_CONNECTION_FLAGS_NONE = 0,
-  G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT = (1<<0),
-  G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER = (1<<1),
-  G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<2),
-  G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION = (1<<3),
-  G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING = (1<<4)
-} GDBusConnectionFlags;
-
-/**
- * GDBusCapabilityFlags:
- * @G_DBUS_CAPABILITY_FLAGS_NONE: No flags set.
- * @G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING: The connection
- * supports exchanging UNIX file descriptors with the remote peer.
- *
- * Capabilities negotiated with the remote peer.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_CAPABILITY_FLAGS_NONE = 0,
-  G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0)
-} GDBusCapabilityFlags;
-
-/**
- * GDBusCallFlags:
- * @G_DBUS_CALL_FLAGS_NONE: No flags set.
- * @G_DBUS_CALL_FLAGS_NO_AUTO_START: The bus must not launch
- * an owner for the destination name in response to this method
- * invocation.
- *
- * Flags used in g_dbus_connection_call() and similar APIs.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_CALL_FLAGS_NONE = 0,
-  G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0)
-} GDBusCallFlags;
-/* (1<<31) is reserved for internal use by GDBusConnection, do not use it. */
-
-/**
- * GDBusMessageType:
- * @G_DBUS_MESSAGE_TYPE_INVALID: Message is of invalid type.
- * @G_DBUS_MESSAGE_TYPE_METHOD_CALL: Method call.
- * @G_DBUS_MESSAGE_TYPE_METHOD_RETURN: Method reply.
- * @G_DBUS_MESSAGE_TYPE_ERROR: Error reply.
- * @G_DBUS_MESSAGE_TYPE_SIGNAL: Signal emission.
- *
- * Message types used in #GDBusMessage.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_MESSAGE_TYPE_INVALID,
-  G_DBUS_MESSAGE_TYPE_METHOD_CALL,
-  G_DBUS_MESSAGE_TYPE_METHOD_RETURN,
-  G_DBUS_MESSAGE_TYPE_ERROR,
-  G_DBUS_MESSAGE_TYPE_SIGNAL
-} GDBusMessageType;
-
-/**
- * GDBusMessageFlags:
- * @G_DBUS_MESSAGE_FLAGS_NONE: No flags set.
- * @G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED: A reply is not expected.
- * @G_DBUS_MESSAGE_FLAGS_NO_AUTO_START: The bus must not launch an
- * owner for the destination name in response to this message.
- *
- * Message flags used in #GDBusMessage.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_MESSAGE_FLAGS_NONE = 0,
-  G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED = (1<<0),
-  G_DBUS_MESSAGE_FLAGS_NO_AUTO_START = (1<<1)
-} GDBusMessageFlags;
-
-/**
- * GDBusMessageHeaderField:
- * @G_DBUS_MESSAGE_HEADER_FIELD_INVALID: Not a valid header field.
- * @G_DBUS_MESSAGE_HEADER_FIELD_PATH: The object path.
- * @G_DBUS_MESSAGE_HEADER_FIELD_INTERFACE: The interface name.
- * @G_DBUS_MESSAGE_HEADER_FIELD_MEMBER: The method or signal name.
- * @G_DBUS_MESSAGE_HEADER_FIELD_ERROR_NAME: The name of the error that occurred.
- * @G_DBUS_MESSAGE_HEADER_FIELD_REPLY_SERIAL: The serial number the message is a reply to.
- * @G_DBUS_MESSAGE_HEADER_FIELD_DESTINATION: The name the message is intended for.
- * @G_DBUS_MESSAGE_HEADER_FIELD_SENDER: Unique name of the sender of the message (filled in by the bus).
- * @G_DBUS_MESSAGE_HEADER_FIELD_SIGNATURE: The signature of the message body.
- * @G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS: The number of UNIX file descriptors that accompany the message.
- *
- * Header fields used in #GDBusMessage.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_MESSAGE_HEADER_FIELD_INVALID,
-  G_DBUS_MESSAGE_HEADER_FIELD_PATH,
-  G_DBUS_MESSAGE_HEADER_FIELD_INTERFACE,
-  G_DBUS_MESSAGE_HEADER_FIELD_MEMBER,
-  G_DBUS_MESSAGE_HEADER_FIELD_ERROR_NAME,
-  G_DBUS_MESSAGE_HEADER_FIELD_REPLY_SERIAL,
-  G_DBUS_MESSAGE_HEADER_FIELD_DESTINATION,
-  G_DBUS_MESSAGE_HEADER_FIELD_SENDER,
-  G_DBUS_MESSAGE_HEADER_FIELD_SIGNATURE,
-  G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS
-} GDBusMessageHeaderField;
-
-/**
- * GDBusPropertyInfoFlags:
- * @G_DBUS_PROPERTY_INFO_FLAGS_NONE: No flags set.
- * @G_DBUS_PROPERTY_INFO_FLAGS_READABLE: Property is readable.
- * @G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE: Property is writable.
- *
- * Flags describing the access control of a D-Bus property.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_PROPERTY_INFO_FLAGS_NONE = 0,
-  G_DBUS_PROPERTY_INFO_FLAGS_READABLE = (1<<0),
-  G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1)
-} GDBusPropertyInfoFlags;
-
-/**
- * GDBusSubtreeFlags:
- * @G_DBUS_SUBTREE_FLAGS_NONE: No flags set.
- * @G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES: Method calls to objects not in the enumerated range
- *                                                       will still be dispatched. This is useful if you want
- *                                                       to dynamically spawn objects in the subtree.
- *
- * Flags passed to g_dbus_connection_register_subtree().
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_SUBTREE_FLAGS_NONE = 0,
-  G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0)
-} GDBusSubtreeFlags;
-
-/**
- * GDBusServerFlags:
- * @G_DBUS_SERVER_FLAGS_NONE: No flags set.
- * @G_DBUS_SERVER_FLAGS_RUN_IN_THREAD: All #GDBusServer::new-connection
- * signals will run in separated dedicated threads (see signal for
- * details).
- * @G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS: Allow the anonymous
- * authentication method.
- *
- * Flags used when creating a #GDBusServer.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_SERVER_FLAGS_NONE = 0,
-  G_DBUS_SERVER_FLAGS_RUN_IN_THREAD = (1<<0),
-  G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<1)
-} GDBusServerFlags;
-
-/**
- * GDBusSignalFlags:
- * @G_DBUS_SIGNAL_FLAGS_NONE: No flags set.
- * @G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE: Don't actually send the AddMatch
- * D-Bus call for this signal subscription.  This gives you more control
- * over which match rules you add (but you must add them manually).
- * @G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE: Match first arguments that
- * contain a bus or interface name with the given namespace.
- * @G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH: Match first arguments that
- * contain an object path that is either equivalent to the given path,
- * or one of the paths is a subpath of the other.
- *
- * Flags used when subscribing to signals via g_dbus_connection_signal_subscribe().
- *
- * Since: 2.26
- */
-typedef enum /*< flags >*/
-{
-  G_DBUS_SIGNAL_FLAGS_NONE = 0,
-  G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE = (1<<0),
-  G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE = (1<<1),
-  G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH = (1<<2)
-} GDBusSignalFlags;
-
-/**
- * GDBusSendMessageFlags:
- * @G_DBUS_SEND_MESSAGE_FLAGS_NONE: No flags set.
- * @G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL: Do not automatically
- * assign a serial number from the #GDBusConnection object when
- * sending a message.
- *
- * Flags used when sending #GDBusMessage<!-- -->s on a #GDBusConnection.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_SEND_MESSAGE_FLAGS_NONE = 0,
-  G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL = (1<<0)
-} GDBusSendMessageFlags;
-/* (1<<31) is reserved for internal use by GDBusConnection, do not use it. */
-
-/**
- * GCredentialsType:
- * @G_CREDENTIALS_TYPE_INVALID: Indicates an invalid native credential type.
- * @G_CREDENTIALS_TYPE_LINUX_UCRED: The native credentials type is a <type>struct ucred</type>.
- * @G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED: The native credentials type is a <type>struct cmsgcred</type>.
- * @G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED: The native credentials type is a <type>struct sockpeercred</type>. Added in 2.30.
- *
- * Enumeration describing different kinds of native credential types.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_CREDENTIALS_TYPE_INVALID,
-  G_CREDENTIALS_TYPE_LINUX_UCRED,
-  G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
-  G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED
-} GCredentialsType;
-
-/**
- * GDBusMessageByteOrder:
- * @G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN: The byte order is big endian.
- * @G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN: The byte order is little endian.
- *
- * Enumeration used to describe the byte order of a D-Bus message.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN    = 'B',
-  G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN = 'l'
-} GDBusMessageByteOrder;
-
-/**
- * GApplicationFlags:
- * @G_APPLICATION_FLAGS_NONE: Default
- * @G_APPLICATION_IS_SERVICE: Run as a service. In this mode, registration
- *      fails if the service is already running, and the application
- *      will initially wait up to 10 seconds for an initial activation
- *      message to arrive.
- * @G_APPLICATION_IS_LAUNCHER: Don't try to become the primary instance.
- * @G_APPLICATION_HANDLES_OPEN: This application handles opening files (in
- *     the primary instance). Note that this flag only affects the default
- *     implementation of local_command_line(), and has no effect if
- *     %G_APPLICATION_HANDLES_COMMAND_LINE is given.
- *     See g_application_run() for details.
- * @G_APPLICATION_HANDLES_COMMAND_LINE: This application handles command line
- *     arguments (in the primary instance). Note that this flag only affect
- *     the default implementation of local_command_line().
- *     See g_application_run() for details.
- * @G_APPLICATION_SEND_ENVIRONMENT: Send the environment of the
- *     launching process to the primary instance. Set this flag if your
- *     application is expected to behave differently depending on certain
- *     environment variables. For instance, an editor might be expected
- *     to use the <envar>GIT_COMMITTER_NAME</envar> environment variable
- *     when editing a git commit message. The environment is available
- *     to the #GApplication::command-line signal handler, via
- *     g_application_command_line_getenv().
- * @G_APPLICATION_NON_UNIQUE: Make no attempts to do any of the typical
- *     single-instance application negotiation, even if the application
- *     ID is given.  The application neither attempts to become the
- *     owner of the application ID nor does it check if an existing
- *     owner already exists.  Everything occurs in the local process.
- *     Since: 2.30.
- *
- * Flags used to define the behaviour of a #GApplication.
- *
- * Since: 2.28
- **/
-typedef enum
-{
-  G_APPLICATION_FLAGS_NONE,
-  G_APPLICATION_IS_SERVICE  =          (1 << 0),
-  G_APPLICATION_IS_LAUNCHER =          (1 << 1),
-
-  G_APPLICATION_HANDLES_OPEN =         (1 << 2),
-  G_APPLICATION_HANDLES_COMMAND_LINE = (1 << 3),
-  G_APPLICATION_SEND_ENVIRONMENT    =  (1 << 4),
-
-  G_APPLICATION_NON_UNIQUE =           (1 << 5)
-} GApplicationFlags;
-
-/**
- * GTlsError:
- * @G_TLS_ERROR_UNAVAILABLE: No TLS provider is available
- * @G_TLS_ERROR_MISC: Miscellaneous TLS error
- * @G_TLS_ERROR_BAD_CERTIFICATE: A certificate could not be parsed
- * @G_TLS_ERROR_NOT_TLS: The TLS handshake failed because the
- *   peer does not seem to be a TLS server.
- * @G_TLS_ERROR_HANDSHAKE: The TLS handshake failed because the
- *   peer's certificate was not acceptable.
- * @G_TLS_ERROR_CERTIFICATE_REQUIRED: The TLS handshake failed because
- *   the server requested a client-side certificate, but none was
- *   provided. See g_tls_connection_set_certificate().
- * @G_TLS_ERROR_EOF: The TLS connection was closed without proper
- *   notice, which may indicate an attack. See
- *   g_tls_connection_set_require_close_notify().
- *
- * An error code used with %G_TLS_ERROR in a #GError returned from a
- * TLS-related routine.
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_ERROR_UNAVAILABLE,
-  G_TLS_ERROR_MISC,
-  G_TLS_ERROR_BAD_CERTIFICATE,
-  G_TLS_ERROR_NOT_TLS,
-  G_TLS_ERROR_HANDSHAKE,
-  G_TLS_ERROR_CERTIFICATE_REQUIRED,
-  G_TLS_ERROR_EOF
-} GTlsError;
-
-/**
- * GTlsCertificateFlags:
- * @G_TLS_CERTIFICATE_UNKNOWN_CA: The signing certificate authority is
- *   not known.
- * @G_TLS_CERTIFICATE_BAD_IDENTITY: The certificate does not match the
- *   expected identity of the site that it was retrieved from.
- * @G_TLS_CERTIFICATE_NOT_ACTIVATED: The certificate's activation time
- *   is still in the future
- * @G_TLS_CERTIFICATE_EXPIRED: The certificate has expired
- * @G_TLS_CERTIFICATE_REVOKED: The certificate has been revoked
- *   according to the #GTlsConnection's certificate revocation list.
- * @G_TLS_CERTIFICATE_INSECURE: The certificate's algorithm is
- *   considered insecure.
- * @G_TLS_CERTIFICATE_GENERIC_ERROR: Some other error occurred validating
- *   the certificate
- * @G_TLS_CERTIFICATE_VALIDATE_ALL: the combination of all of the above
- *   flags
- *
- * A set of flags describing TLS certification validation. This can be
- * used to set which validation steps to perform (eg, with
- * g_tls_client_connection_set_validation_flags()), or to describe why
- * a particular certificate was rejected (eg, in
- * #GTlsConnection::accept-certificate).
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_CERTIFICATE_UNKNOWN_CA    = (1 << 0),
-  G_TLS_CERTIFICATE_BAD_IDENTITY  = (1 << 1),
-  G_TLS_CERTIFICATE_NOT_ACTIVATED = (1 << 2),
-  G_TLS_CERTIFICATE_EXPIRED       = (1 << 3),
-  G_TLS_CERTIFICATE_REVOKED       = (1 << 4),
-  G_TLS_CERTIFICATE_INSECURE      = (1 << 5),
-  G_TLS_CERTIFICATE_GENERIC_ERROR = (1 << 6),
-
-  G_TLS_CERTIFICATE_VALIDATE_ALL  = 0x007f
-} GTlsCertificateFlags;
-
-/**
- * GTlsAuthenticationMode:
- * @G_TLS_AUTHENTICATION_NONE: client authentication not required
- * @G_TLS_AUTHENTICATION_REQUESTED: client authentication is requested
- * @G_TLS_AUTHENTICATION_REQUIRED: client authentication is required
- *
- * The client authentication mode for a #GTlsServerConnection.
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_AUTHENTICATION_NONE,
-  G_TLS_AUTHENTICATION_REQUESTED,
-  G_TLS_AUTHENTICATION_REQUIRED
-} GTlsAuthenticationMode;
-
-/**
- * GTlsRehandshakeMode:
- * @G_TLS_REHANDSHAKE_NEVER: Never allow rehandshaking
- * @G_TLS_REHANDSHAKE_SAFELY: Allow safe rehandshaking only
- * @G_TLS_REHANDSHAKE_UNSAFELY: Allow unsafe rehandshaking
- *
- * When to allow rehandshaking. See
- * g_tls_connection_set_rehandshake_mode().
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_REHANDSHAKE_NEVER,
-  G_TLS_REHANDSHAKE_SAFELY,
-  G_TLS_REHANDSHAKE_UNSAFELY
-} GTlsRehandshakeMode;
-
-/**
- * GTlsPasswordFlags:
- * @G_TLS_PASSWORD_NONE: No flags
- * @G_TLS_PASSWORD_RETRY: The password was wrong, and the user should retry.
- * @G_TLS_PASSWORD_MANY_TRIES: Hint to the user that the password has been
- *    wrong many times, and the user may not have many chances left.
- * @G_TLS_PASSWORD_FINAL_TRY: Hint to the user that this is the last try to get
- *    this password right.
- *
- * Various flags for the password.
- *
- * Since: 2.30
- */
-
-typedef enum _GTlsPasswordFlags
-{
-  G_TLS_PASSWORD_NONE = 0,
-  G_TLS_PASSWORD_RETRY = 1 << 1,
-  G_TLS_PASSWORD_MANY_TRIES = 1 << 2,
-  G_TLS_PASSWORD_FINAL_TRY = 1 << 3
-} GTlsPasswordFlags;
-
-/**
- * GTlsInteractionResult:
- * @G_TLS_INTERACTION_UNHANDLED: The interaction was unhandled (i.e. not
- *     implemented).
- * @G_TLS_INTERACTION_HANDLED: The interaction completed, and resulting data
- *     is available.
- * @G_TLS_INTERACTION_FAILED: The interaction has failed, or was cancelled.
- *     and the operation should be aborted.
- *
- * #GTlsInteractionResult is returned by various functions in #GTlsInteraction
- * when finishing an interaction request.
- *
- * Since: 2.30
- */
-typedef enum {
-  G_TLS_INTERACTION_UNHANDLED,
-  G_TLS_INTERACTION_HANDLED,
-  G_TLS_INTERACTION_FAILED
-} GTlsInteractionResult;
-
-/**
- * GDBusInterfaceSkeletonFlags:
- * @G_DBUS_INTERFACE_SKELETON_FLAGS_NONE: No flags set.
- * @G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD: Each method invocation is handled in
- *   a thread dedicated to the invocation. This means that the method implementation can use blocking IO
- *   without blocking any other part of the process. It also means that the method implementation must
- *   use locking to access data structures used by other threads.
- *
- * Flags describing the behavior of a #GDBusInterfaceSkeleton instance.
- *
- * Since: 2.30
- */
-typedef enum
-{
-  G_DBUS_INTERFACE_SKELETON_FLAGS_NONE = 0,
-  G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD = (1<<0)
-} GDBusInterfaceSkeletonFlags;
-
-/**
- * GDBusObjectManagerClientFlags:
- * @G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE: No flags set.
- * @G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START: If not set and the
- *   manager is for a well-known name, then request the bus to launch
- *   an owner for the name if no-one owns the name. This flag can only
- *   be used in managers for well-known names.
- *
- * Flags used when constructing a #GDBusObjectManagerClient.
- *
- * Since: 2.30
- */
-typedef enum
-{
-  G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE = 0,
-  G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START = (1<<0)
-} GDBusObjectManagerClientFlags;
-
-/**
- * GTlsDatabaseVerifyFlags:
- * @G_TLS_DATABASE_VERIFY_NONE: No verification flags
- *
- * Flags for g_tls_database_verify_chain().
- *
- * Since: 2.30
- */
-typedef enum /*< flags >*/ {
-  G_TLS_DATABASE_VERIFY_NONE = 0
-} GTlsDatabaseVerifyFlags;
-
-/**
- * GTlsDatabaseLookupFlags:
- * @G_TLS_DATABASE_LOOKUP_NONE: No lookup flags
- * @G_TLS_DATABASE_LOOKUP_KEYPAIR: Restrict lookup to certificates that have
- *     a private key.
- *
- * Flags for g_tls_database_lookup_certificate_handle(),
- * g_tls_database_lookup_certificate_issuer(),
- * and g_tls_database_lookup_certificates_issued_by().
- *
- * Since: 2.30
- */
-typedef enum {
-  G_TLS_DATABASE_LOOKUP_NONE = 0,
-  G_TLS_DATABASE_LOOKUP_KEYPAIR = 1
-} GTlsDatabaseLookupFlags;
-
-/**
- * GIOModuleScopeFlags:
- * @G_IO_MODULE_SCOPE_NONE: No module scan flags
- * @G_IO_MODULE_SCOPE_BLOCK_DUPLICATES: When using this scope to load or
- *     scan modules, automatically block a modules which has the same base
- *     basename as previously loaded module.
- *
- * Flags for use with g_io_module_scope_new().
- *
- * Since: 2.30
- */
-typedef enum {
-  G_IO_MODULE_SCOPE_NONE,
-  G_IO_MODULE_SCOPE_BLOCK_DUPLICATES
-} GIOModuleScopeFlags;
-
-/**
- * GSocketClientEvent:
- * @G_SOCKET_CLIENT_RESOLVING: The client is doing a DNS lookup.
- * @G_SOCKET_CLIENT_RESOLVED: The client has completed a DNS lookup.
- * @G_SOCKET_CLIENT_CONNECTING: The client is connecting to a remote
- *   host (either a proxy or the destination server).
- * @G_SOCKET_CLIENT_CONNECTED: The client has connected to a remote
- *   host.
- * @G_SOCKET_CLIENT_PROXY_NEGOTIATING: The client is negotiating
- *   with a proxy to connect to the destination server.
- * @G_SOCKET_CLIENT_PROXY_NEGOTIATED: The client has negotiated
- *   with the proxy server.
- * @G_SOCKET_CLIENT_TLS_HANDSHAKING: The client is performing a
- *   TLS handshake.
- * @G_SOCKET_CLIENT_TLS_HANDSHAKED: The client has performed a
- *   TLS handshake.
- * @G_SOCKET_CLIENT_COMPLETE: The client is done with a particular
- *   #GSocketConnectable.
- *
- * Describes an event occurring on a #GSocketClient. See the
- * #GSocketClient::event signal for more details.
- *
- * Additional values may be added to this type in the future.
- *
- * Since: 2.32
- */
-typedef enum {
-  G_SOCKET_CLIENT_RESOLVING,
-  G_SOCKET_CLIENT_RESOLVED,
-  G_SOCKET_CLIENT_CONNECTING,
-  G_SOCKET_CLIENT_CONNECTED,
-  G_SOCKET_CLIENT_PROXY_NEGOTIATING,
-  G_SOCKET_CLIENT_PROXY_NEGOTIATED,
-  G_SOCKET_CLIENT_TLS_HANDSHAKING,
-  G_SOCKET_CLIENT_TLS_HANDSHAKED,
-  G_SOCKET_CLIENT_COMPLETE
-} GSocketClientEvent;
-
-/**
- * GTestDBusFlags:
- * @G_TEST_DBUS_NONE: No flags.
- *
- * Flags to define future #GTestDBus behaviour.
- *
- * Since: 2.34
- */
-typedef enum /*< flags >*/ {
-  G_TEST_DBUS_NONE = 0
-} GTestDBusFlags;
-
-G_END_DECLS
-
-#endif /* __GIO_ENUMS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gioenumtypes.h b/linux-x86/include/glib-2.0/gio/gioenumtypes.h
deleted file mode 100644
index 5d31879..0000000
--- a/linux-x86/include/glib-2.0/gio/gioenumtypes.h
+++ /dev/null
@@ -1,161 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __GIO_ENUM_TYPES_H__
-#define __GIO_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "gioenums.h" */
-GLIB_AVAILABLE_IN_ALL GType g_app_info_create_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_APP_INFO_CREATE_FLAGS (g_app_info_create_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_converter_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_CONVERTER_FLAGS (g_converter_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_converter_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_CONVERTER_RESULT (g_converter_result_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_data_stream_byte_order_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DATA_STREAM_BYTE_ORDER (g_data_stream_byte_order_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_data_stream_newline_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DATA_STREAM_NEWLINE_TYPE (g_data_stream_newline_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_file_attribute_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_TYPE (g_file_attribute_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_file_attribute_info_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS (g_file_attribute_info_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_file_attribute_status_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_STATUS (g_file_attribute_status_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_file_query_info_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_QUERY_INFO_FLAGS (g_file_query_info_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_file_create_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_CREATE_FLAGS (g_file_create_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_file_measure_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MEASURE_FLAGS (g_file_measure_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_mount_mount_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_MOUNT_FLAGS (g_mount_mount_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_mount_unmount_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_UNMOUNT_FLAGS (g_mount_unmount_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_drive_start_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DRIVE_START_FLAGS (g_drive_start_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_drive_start_stop_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DRIVE_START_STOP_TYPE (g_drive_start_stop_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_file_copy_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_COPY_FLAGS (g_file_copy_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_file_monitor_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MONITOR_FLAGS (g_file_monitor_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_file_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_TYPE (g_file_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_filesystem_preview_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILESYSTEM_PREVIEW_TYPE (g_filesystem_preview_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_file_monitor_event_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MONITOR_EVENT (g_file_monitor_event_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_io_error_enum_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_ERROR_ENUM (g_io_error_enum_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_ask_password_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_ASK_PASSWORD_FLAGS (g_ask_password_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_password_save_get_type (void) G_GNUC_CONST;
-#define G_TYPE_PASSWORD_SAVE (g_password_save_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_mount_operation_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_OPERATION_RESULT (g_mount_operation_result_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_output_stream_splice_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_OUTPUT_STREAM_SPLICE_FLAGS (g_output_stream_splice_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_io_stream_splice_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_STREAM_SPLICE_FLAGS (g_io_stream_splice_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_emblem_origin_get_type (void) G_GNUC_CONST;
-#define G_TYPE_EMBLEM_ORIGIN (g_emblem_origin_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_resolver_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOLVER_ERROR (g_resolver_error_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_resolver_record_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOLVER_RECORD_TYPE (g_resolver_record_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_resource_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOURCE_ERROR (g_resource_error_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_resource_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOURCE_FLAGS (g_resource_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_resource_lookup_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOURCE_LOOKUP_FLAGS (g_resource_lookup_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_socket_family_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_FAMILY (g_socket_family_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_socket_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_TYPE (g_socket_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_socket_msg_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_MSG_FLAGS (g_socket_msg_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_socket_protocol_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_PROTOCOL (g_socket_protocol_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_zlib_compressor_format_get_type (void) G_GNUC_CONST;
-#define G_TYPE_ZLIB_COMPRESSOR_FORMAT (g_zlib_compressor_format_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_unix_socket_address_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_UNIX_SOCKET_ADDRESS_TYPE (g_unix_socket_address_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_bus_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_BUS_TYPE (g_bus_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_bus_name_owner_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_BUS_NAME_OWNER_FLAGS (g_bus_name_owner_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_bus_name_watcher_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_BUS_NAME_WATCHER_FLAGS (g_bus_name_watcher_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_proxy_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_PROXY_FLAGS (g_dbus_proxy_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_ERROR (g_dbus_error_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_connection_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_CONNECTION_FLAGS (g_dbus_connection_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_capability_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_CAPABILITY_FLAGS (g_dbus_capability_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_call_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_CALL_FLAGS (g_dbus_call_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_message_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_TYPE (g_dbus_message_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_message_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_FLAGS (g_dbus_message_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_message_header_field_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_HEADER_FIELD (g_dbus_message_header_field_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_property_info_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_PROPERTY_INFO_FLAGS (g_dbus_property_info_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_subtree_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SUBTREE_FLAGS (g_dbus_subtree_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_server_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SERVER_FLAGS (g_dbus_server_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_signal_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SIGNAL_FLAGS (g_dbus_signal_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_send_message_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SEND_MESSAGE_FLAGS (g_dbus_send_message_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_credentials_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_CREDENTIALS_TYPE (g_credentials_type_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_message_byte_order_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_BYTE_ORDER (g_dbus_message_byte_order_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_application_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_APPLICATION_FLAGS (g_application_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_tls_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_ERROR (g_tls_error_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_tls_certificate_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_CERTIFICATE_FLAGS (g_tls_certificate_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_tls_authentication_mode_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_AUTHENTICATION_MODE (g_tls_authentication_mode_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_tls_rehandshake_mode_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_REHANDSHAKE_MODE (g_tls_rehandshake_mode_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_tls_password_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_PASSWORD_FLAGS (g_tls_password_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_tls_interaction_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_INTERACTION_RESULT (g_tls_interaction_result_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_interface_skeleton_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_INTERFACE_SKELETON_FLAGS (g_dbus_interface_skeleton_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_dbus_object_manager_client_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_OBJECT_MANAGER_CLIENT_FLAGS (g_dbus_object_manager_client_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_tls_database_verify_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_DATABASE_VERIFY_FLAGS (g_tls_database_verify_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_tls_database_lookup_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_DATABASE_LOOKUP_FLAGS (g_tls_database_lookup_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_io_module_scope_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_MODULE_SCOPE_FLAGS (g_io_module_scope_flags_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_socket_client_event_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_CLIENT_EVENT (g_socket_client_event_get_type ())
-GLIB_AVAILABLE_IN_ALL GType g_test_dbus_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TEST_DBUS_FLAGS (g_test_dbus_flags_get_type ())
-
-/* enumerations from "gsettings.h" */
-GLIB_AVAILABLE_IN_ALL GType g_settings_bind_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SETTINGS_BIND_FLAGS (g_settings_bind_flags_get_type ())
-G_END_DECLS
-
-#endif /* __GIO_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/linux-x86/include/glib-2.0/gio/gioerror.h b/linux-x86/include/glib-2.0/gio/gioerror.h
deleted file mode 100644
index ed23df4..0000000
--- a/linux-x86/include/glib-2.0/gio/gioerror.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_IO_ERROR_H__
-#define __G_IO_ERROR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <glib.h>
-#include <gio/gioenums.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_IO_ERROR:
- *
- * Error domain for GIO. Errors in this domain will be from the #GIOErrorEnum enumeration.
- * See #GError for more information on error domains.
- **/
-#define G_IO_ERROR g_io_error_quark()
-
-GLIB_AVAILABLE_IN_ALL
-GQuark       g_io_error_quark      (void);
-GLIB_AVAILABLE_IN_ALL
-GIOErrorEnum g_io_error_from_errno (gint err_no);
-
-#ifdef G_OS_WIN32
-GLIB_AVAILABLE_IN_ALL
-GIOErrorEnum g_io_error_from_win32_error (gint error_code);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_IO_ERROR_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/giomodule.h b/linux-x86/include/glib-2.0/gio/giomodule.h
deleted file mode 100644
index b0aedeb..0000000
--- a/linux-x86/include/glib-2.0/gio/giomodule.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_IO_MODULE_H__
-#define __G_IO_MODULE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-#include <gmodule.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GIOModuleScope GIOModuleScope;
-
-GLIB_AVAILABLE_IN_2_30
-GIOModuleScope *   g_io_module_scope_new     (GIOModuleScopeFlags  flags);
-GLIB_AVAILABLE_IN_2_30
-void               g_io_module_scope_free    (GIOModuleScope      *scope);
-GLIB_AVAILABLE_IN_2_30
-void               g_io_module_scope_block   (GIOModuleScope      *scope,
-                                              const gchar         *basename);
-
-#define G_IO_TYPE_MODULE         (g_io_module_get_type ())
-#define G_IO_MODULE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_IO_TYPE_MODULE, GIOModule))
-#define G_IO_MODULE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_IO_TYPE_MODULE, GIOModuleClass))
-#define G_IO_IS_MODULE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_IO_TYPE_MODULE))
-#define G_IO_IS_MODULE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_IO_TYPE_MODULE))
-#define G_IO_MODULE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_IO_TYPE_MODULE, GIOModuleClass))
-
-/**
- * GIOModule:
- *
- * Opaque module base class for extending GIO.
- **/
-typedef struct _GIOModuleClass GIOModuleClass;
-
-GLIB_AVAILABLE_IN_ALL
-GType              g_io_module_get_type                       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GIOModule         *g_io_module_new                            (const gchar       *filename);
-
-GLIB_AVAILABLE_IN_ALL
-void               g_io_modules_scan_all_in_directory         (const char        *dirname);
-GLIB_AVAILABLE_IN_ALL
-GList             *g_io_modules_load_all_in_directory         (const gchar       *dirname);
-
-GLIB_AVAILABLE_IN_2_30
-void               g_io_modules_scan_all_in_directory_with_scope   (const gchar       *dirname,
-                                                                    GIOModuleScope    *scope);
-GLIB_AVAILABLE_IN_2_30
-GList             *g_io_modules_load_all_in_directory_with_scope   (const gchar       *dirname,
-                                                                    GIOModuleScope    *scope);
-
-GLIB_AVAILABLE_IN_ALL
-GIOExtensionPoint *g_io_extension_point_register              (const char        *name);
-GLIB_AVAILABLE_IN_ALL
-GIOExtensionPoint *g_io_extension_point_lookup                (const char        *name);
-GLIB_AVAILABLE_IN_ALL
-void               g_io_extension_point_set_required_type     (GIOExtensionPoint *extension_point,
-							       GType              type);
-GLIB_AVAILABLE_IN_ALL
-GType              g_io_extension_point_get_required_type     (GIOExtensionPoint *extension_point);
-GLIB_AVAILABLE_IN_ALL
-GList             *g_io_extension_point_get_extensions        (GIOExtensionPoint *extension_point);
-GLIB_AVAILABLE_IN_ALL
-GIOExtension *     g_io_extension_point_get_extension_by_name (GIOExtensionPoint *extension_point,
-							       const char        *name);
-GLIB_AVAILABLE_IN_ALL
-GIOExtension *     g_io_extension_point_implement             (const char        *extension_point_name,
-							       GType              type,
-							       const char        *extension_name,
-							       gint               priority);
-
-GLIB_AVAILABLE_IN_ALL
-GType              g_io_extension_get_type                    (GIOExtension      *extension);
-GLIB_AVAILABLE_IN_ALL
-const char *       g_io_extension_get_name                    (GIOExtension      *extension);
-GLIB_AVAILABLE_IN_ALL
-gint               g_io_extension_get_priority                (GIOExtension      *extension);
-GLIB_AVAILABLE_IN_ALL
-GTypeClass*        g_io_extension_ref_class                   (GIOExtension      *extension);
-
-
-/* API for the modules to implement */
-
-/**
- * g_io_module_load:
- * @module: a #GIOModule.
- *
- * Required API for GIO modules to implement.
- * This function is ran after the module has been loaded into GIO,
- * to initialize the module.
- **/
-GLIB_AVAILABLE_IN_ALL
-void   g_io_module_load   (GIOModule *module);
-
-/**
- * g_io_module_unload:
- * @module: a #GIOModule.
- *
- * Required API for GIO modules to implement.
- * This function is ran when the module is being unloaded from GIO,
- * to finalize the module.
- **/
-GLIB_AVAILABLE_IN_ALL
-void   g_io_module_unload (GIOModule *module);
-
-/**
- * g_io_module_query:
- *
- * Optional API for GIO modules to implement.
- *
- * Should return a list of all the extension points that may be
- * implemented in this module.
- *
- * This method will not be called in normal use, however it may be
- * called when probing existing modules and recording which extension
- * points that this model is used for. This means we won't have to
- * load and initialze this module unless its needed.
- *
- * If this function is not implemented by the module the module will
- * always be loaded, initialized and then unloaded on application startup
- * so that it can register its extension points during init.
- *
- * Note that a module need not actually implement all the extension points
- * that g_io_module_query returns, since the exact list of extension may
- * depend on runtime issues. However all extension points actually implemented
- * must be returned by g_io_module_query() (if defined).
- *
- * When installing a module that implements g_io_module_query you must
- * run gio-querymodules in order to build the cache files required for
- * lazy loading.
- *
- * Returns: (transfer full): A %NULL-terminated array of strings, listing the supported
- *     extension points of the module. The array must be suitable for
- *     freeing with g_strfreev().
- *
- * Since: 2.24
- **/
-GLIB_AVAILABLE_IN_ALL
-char **g_io_module_query (void);
-
-G_END_DECLS
-
-#endif /* __G_IO_MODULE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gioscheduler.h b/linux-x86/include/glib-2.0/gio/gioscheduler.h
deleted file mode 100644
index c044b82..0000000
--- a/linux-x86/include/glib-2.0/gio/gioscheduler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_IO_SCHEDULER_H__
-#define __G_IO_SCHEDULER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-GLIB_DEPRECATED_IN_2_36_FOR ("GThreadPool or g_task_run_in_thread")
-void     g_io_scheduler_push_job                   (GIOSchedulerJobFunc  job_func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify,
-						    gint                 io_priority,
-						    GCancellable        *cancellable);
-GLIB_DEPRECATED_IN_2_36
-void     g_io_scheduler_cancel_all_jobs            (void);
-GLIB_DEPRECATED_IN_2_36_FOR (g_main_context_invoke)
-gboolean g_io_scheduler_job_send_to_mainloop       (GIOSchedulerJob     *job,
-						    GSourceFunc          func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify);
-GLIB_DEPRECATED_IN_2_36_FOR (g_main_context_invoke)
-void     g_io_scheduler_job_send_to_mainloop_async (GIOSchedulerJob     *job,
-						    GSourceFunc          func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify);
-
-G_END_DECLS
-
-#endif /* __G_IO_SCHEDULER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/giostream.h b/linux-x86/include/glib-2.0/gio/giostream.h
deleted file mode 100644
index 561b0e9..0000000
--- a/linux-x86/include/glib-2.0/gio/giostream.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008, 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * See the included COPYING file for more information.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_IO_STREAM_H__
-#define __G_IO_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/ginputstream.h>
-#include <gio/goutputstream.h>
-#include <gio/gcancellable.h>
-#include <gio/gioerror.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_IO_STREAM         (g_io_stream_get_type ())
-#define G_IO_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_IO_STREAM, GIOStream))
-#define G_IO_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_IO_STREAM, GIOStreamClass))
-#define G_IS_IO_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_IO_STREAM))
-#define G_IS_IO_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_IO_STREAM))
-#define G_IO_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_IO_STREAM, GIOStreamClass))
-
-typedef struct _GIOStreamPrivate                            GIOStreamPrivate;
-typedef struct _GIOStreamClass                              GIOStreamClass;
-
-/**
- * GIOStream:
- *
- * Base class for read-write streams.
- **/
-struct _GIOStream
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GIOStreamPrivate *priv;
-};
-
-struct _GIOStreamClass
-{
-  GObjectClass parent_class;
-
-  GInputStream *  (*get_input_stream)  (GIOStream *stream);
-  GOutputStream * (*get_output_stream) (GIOStream *stream);
-
-  gboolean (* close_fn)	    (GIOStream           *stream,
-                             GCancellable        *cancellable,
-                             GError             **error);
-  void     (* close_async)  (GIOStream           *stream,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gboolean (* close_finish) (GIOStream           *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-  void (*_g_reserved9) (void);
-  void (*_g_reserved10) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType          g_io_stream_get_type          (void)  G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GInputStream * g_io_stream_get_input_stream  (GIOStream            *stream);
-GLIB_AVAILABLE_IN_ALL
-GOutputStream *g_io_stream_get_output_stream (GIOStream            *stream);
-
-GLIB_AVAILABLE_IN_ALL
-void           g_io_stream_splice_async      (GIOStream            *stream1,
-					      GIOStream            *stream2,
-					      GIOStreamSpliceFlags  flags,
-					      int                   io_priority,
-					      GCancellable         *cancellable,
-					      GAsyncReadyCallback   callback,
-					      gpointer              user_data);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_io_stream_splice_finish     (GAsyncResult         *result,
-                                              GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_io_stream_close             (GIOStream            *stream,
-					      GCancellable         *cancellable,
-					      GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-void           g_io_stream_close_async       (GIOStream            *stream,
-					      int                   io_priority,
-					      GCancellable         *cancellable,
-					      GAsyncReadyCallback   callback,
-					      gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_io_stream_close_finish      (GIOStream            *stream,
-					      GAsyncResult         *result,
-					      GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_io_stream_is_closed         (GIOStream            *stream);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_io_stream_has_pending       (GIOStream            *stream);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_io_stream_set_pending       (GIOStream            *stream,
-					      GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void           g_io_stream_clear_pending     (GIOStream            *stream);
-
-G_END_DECLS
-
-#endif /* __G_IO_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/giotypes.h b/linux-x86/include/glib-2.0/gio/giotypes.h
deleted file mode 100644
index fdf7202..0000000
--- a/linux-x86/include/glib-2.0/gio/giotypes.h
+++ /dev/null
@@ -1,518 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __GIO_TYPES_H__
-#define __GIO_TYPES_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gioenums.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAppLaunchContext             GAppLaunchContext;
-typedef struct _GAppInfo                      GAppInfo; /* Dummy typedef */
-typedef struct _GAsyncResult                  GAsyncResult; /* Dummy typedef */
-typedef struct _GAsyncInitable                GAsyncInitable;
-typedef struct _GBufferedInputStream          GBufferedInputStream;
-typedef struct _GBufferedOutputStream         GBufferedOutputStream;
-typedef struct _GCancellable                  GCancellable;
-typedef struct _GCharsetConverter             GCharsetConverter;
-typedef struct _GConverter                    GConverter;
-typedef struct _GConverterInputStream         GConverterInputStream;
-typedef struct _GConverterOutputStream        GConverterOutputStream;
-typedef struct _GDataInputStream              GDataInputStream;
-typedef struct _GSimplePermission             GSimplePermission;
-typedef struct _GZlibCompressor               GZlibCompressor;
-typedef struct _GZlibDecompressor             GZlibDecompressor;
-
-typedef struct _GSimpleActionGroup            GSimpleActionGroup;
-typedef struct _GRemoteActionGroup            GRemoteActionGroup;
-typedef struct _GDBusActionGroup              GDBusActionGroup;
-typedef struct _GActionMap                    GActionMap;
-typedef struct _GActionGroup                  GActionGroup;
-typedef struct _GPropertyAction               GPropertyAction;
-typedef struct _GSimpleAction                 GSimpleAction;
-typedef struct _GAction                       GAction;
-typedef struct _GApplication                  GApplication;
-typedef struct _GApplicationCommandLine       GApplicationCommandLine;
-typedef struct _GSettingsBackend              GSettingsBackend;
-typedef struct _GSettings                     GSettings;
-typedef struct _GPermission                   GPermission;
-
-typedef struct _GMenuModel                    GMenuModel;
-
-/**
- * GDrive:
- *
- * Opaque drive object.
- **/
-typedef struct _GDrive                        GDrive; /* Dummy typedef */
-typedef struct _GFileEnumerator               GFileEnumerator;
-typedef struct _GFileMonitor                  GFileMonitor;
-typedef struct _GFilterInputStream            GFilterInputStream;
-typedef struct _GFilterOutputStream           GFilterOutputStream;
-
-/**
- * GFile:
- *
- * A handle to an object implementing the #GFileIface interface.
- * Generally stores a location within the file system. Handles do not
- * necessarily represent files or directories that currently exist.
- **/
-typedef struct _GFile                         GFile; /* Dummy typedef */
-typedef struct _GFileInfo                     GFileInfo;
-
-/**
- * GFileAttributeMatcher:
- *
- * Determines if a string matches a file attribute.
- **/
-typedef struct _GFileAttributeMatcher         GFileAttributeMatcher;
-typedef struct _GFileAttributeInfo            GFileAttributeInfo;
-typedef struct _GFileAttributeInfoList        GFileAttributeInfoList;
-typedef struct _GFileDescriptorBased          GFileDescriptorBased;
-typedef struct _GFileInputStream              GFileInputStream;
-typedef struct _GFileOutputStream             GFileOutputStream;
-typedef struct _GFileIOStream                 GFileIOStream;
-typedef struct _GFileIcon                     GFileIcon;
-typedef struct _GFilenameCompleter            GFilenameCompleter;
-
-
-typedef struct _GIcon                         GIcon; /* Dummy typedef */
-typedef struct _GInetAddress                  GInetAddress;
-typedef struct _GInetAddressMask              GInetAddressMask;
-typedef struct _GInetSocketAddress            GInetSocketAddress;
-typedef struct _GInputStream                  GInputStream;
-typedef struct _GInitable                     GInitable;
-typedef struct _GIOModule                     GIOModule;
-typedef struct _GIOExtensionPoint             GIOExtensionPoint;
-typedef struct _GIOExtension                  GIOExtension;
-
-/**
- * GIOSchedulerJob:
- *
- * Opaque class for defining and scheduling IO jobs.
- **/
-typedef struct _GIOSchedulerJob               GIOSchedulerJob;
-typedef struct _GIOStreamAdapter              GIOStreamAdapter;
-typedef struct _GLoadableIcon                 GLoadableIcon; /* Dummy typedef */
-typedef struct _GBytesIcon                    GBytesIcon;
-typedef struct _GMemoryInputStream            GMemoryInputStream;
-typedef struct _GMemoryOutputStream           GMemoryOutputStream;
-
-/**
- * GMount:
- *
- * A handle to an object implementing the #GMountIface interface.
- **/
-typedef struct _GMount                        GMount; /* Dummy typedef */
-typedef struct _GMountOperation               GMountOperation;
-typedef struct _GNetworkAddress               GNetworkAddress;
-typedef struct _GNetworkMonitor               GNetworkMonitor;
-typedef struct _GNetworkService               GNetworkService;
-typedef struct _GOutputStream                 GOutputStream;
-typedef struct _GIOStream                     GIOStream;
-typedef struct _GPollableInputStream          GPollableInputStream; /* Dummy typedef */
-typedef struct _GPollableOutputStream         GPollableOutputStream; /* Dummy typedef */
-typedef struct _GResolver                     GResolver;
-/**
- * GResource:
- *
- * A resource bundle.
- *
- * Since: 2.32
- */
-typedef struct _GResource                     GResource;
-typedef struct _GSeekable                     GSeekable;
-typedef struct _GSimpleAsyncResult            GSimpleAsyncResult;
-
-/**
- * GSocket:
- *
- * A lowlevel network socket object.
- *
- * Since: 2.22
- **/
-typedef struct _GSocket                       GSocket;
-
-/**
- * GSocketControlMessage:
- *
- * Base class for socket-type specific control messages that can be sent and
- * received over #GSocket.
- **/
-typedef struct _GSocketControlMessage         GSocketControlMessage;
-/**
- * GSocketClient:
- *
- * A helper class for network clients to make connections.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketClient                               GSocketClient;
-/**
- * GSocketConnection:
- *
- * A socket connection GIOStream object for connection-oriented sockets.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketConnection                           GSocketConnection;
-/**
- * GSocketListener:
- *
- * A helper class for network servers to listen for and accept connections.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketListener                             GSocketListener;
-/**
- * GSocketService:
- *
- * A helper class for handling accepting incomming connections in the
- * glib mainloop.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketService                              GSocketService;
-typedef struct _GSocketAddress                GSocketAddress;
-typedef struct _GSocketAddressEnumerator      GSocketAddressEnumerator;
-typedef struct _GSocketConnectable            GSocketConnectable;
-typedef struct _GSrvTarget                    GSrvTarget;
-typedef struct _GTask                         GTask;
-/**
- * GTcpConnection:
- *
- * A #GSocketConnection for TCP/IP connections.
- *
- * Since: 2.22
- **/
-typedef struct _GTcpConnection                              GTcpConnection;
-typedef struct _GTcpWrapperConnection                       GTcpWrapperConnection;
-/**
- * GThreadedSocketService:
- *
- * A helper class for handling accepting incoming connections in the
- * glib mainloop and handling them in a thread.
- *
- * Since: 2.22
- **/
-typedef struct _GThreadedSocketService                      GThreadedSocketService;
-typedef struct _GThemedIcon                   GThemedIcon;
-typedef struct _GTlsCertificate               GTlsCertificate;
-typedef struct _GTlsClientConnection          GTlsClientConnection; /* Dummy typedef */
-typedef struct _GTlsConnection                GTlsConnection;
-typedef struct _GTlsDatabase                  GTlsDatabase;
-typedef struct _GTlsFileDatabase              GTlsFileDatabase;
-typedef struct _GTlsInteraction               GTlsInteraction;
-typedef struct _GTlsPassword                  GTlsPassword;
-typedef struct _GTlsServerConnection          GTlsServerConnection; /* Dummy typedef */
-typedef struct _GVfs                          GVfs; /* Dummy typedef */
-
-/**
- * GProxyResolver:
- *
- * A helper class to enumerate proxies base on URI.
- *
- * Since: 2.26
- **/
-typedef struct _GProxyResolver                GProxyResolver;
-typedef struct _GProxy			      GProxy;
-typedef struct _GProxyAddress		      GProxyAddress;
-typedef struct _GProxyAddressEnumerator	      GProxyAddressEnumerator;
-
-/**
- * GVolume:
- *
- * Opaque mountable volume object.
- **/
-typedef struct _GVolume                       GVolume; /* Dummy typedef */
-typedef struct _GVolumeMonitor                GVolumeMonitor;
-
-/**
- * GAsyncReadyCallback:
- * @source_object: the object the asynchronous operation was started with.
- * @res: a #GAsyncResult.
- * @user_data: user data passed to the callback.
- *
- * Type definition for a function that will be called back when an asynchronous
- * operation within GIO has been completed.
- **/
-typedef void (*GAsyncReadyCallback) (GObject *source_object,
-				     GAsyncResult *res,
-				     gpointer user_data);
-
-/**
- * GFileProgressCallback:
- * @current_num_bytes: the current number of bytes in the operation.
- * @total_num_bytes: the total number of bytes in the operation.
- * @user_data: user data passed to the callback.
- *
- * When doing file operations that may take a while, such as moving
- * a file or copying a file, a progress callback is used to pass how
- * far along that operation is to the application.
- **/
-typedef void (*GFileProgressCallback) (goffset current_num_bytes,
-                                       goffset total_num_bytes,
-                                       gpointer user_data);
-
-/**
- * GFileReadMoreCallback:
- * @file_contents: the data as currently read.
- * @file_size: the size of the data currently read.
- * @callback_data: data passed to the callback.
- *
- * When loading the partial contents of a file with g_file_load_partial_contents_async(),
- * it may become necessary to determine if any more data from the file should be loaded.
- * A #GFileReadMoreCallback function facilitates this by returning %TRUE if more data
- * should be read, or %FALSE otherwise.
- *
- * Returns: %TRUE if more data should be read back. %FALSE otherwise.
- **/
-typedef gboolean (* GFileReadMoreCallback) (const char *file_contents,
-                                            goffset file_size,
-                                            gpointer callback_data);
-
-/**
- * GFileMeasureProgressCallback:
- * @reporting: %TRUE if more reports will come
- * @current_size: the current cumulative size measurement
- * @num_dirs: the number of directories visited so far
- * @num_files: the number of non-directory files encountered
- * @user_data: the data passed to the original request for this callback
- *
- * This callback type is used by g_file_measure_disk_usage() to make
- * periodic progress reports when measuring the amount of disk spaced
- * used by a directory.
- *
- * These calls are made on a best-effort basis and not all types of
- * #GFile will support them.  At the minimum, however, one call will
- * always be made immediately.
- *
- * In the case that there is no support, @reporting will be set to
- * %FALSE (and the other values undefined) and no further calls will be
- * made.  Otherwise, the @reporting will be %TRUE and the other values
- * all-zeros during the first (immediate) call.  In this way, you can
- * know which type of progress UI to show without a delay.
- *
- * For g_file_measure_disk_usage() the callback is made directly.  For
- * g_file_measure_disk_usage_async() the callback is made via the
- * default main context of the calling thread (ie: the same way that the
- * final async result would be reported).
- *
- * @current_size is in the same units as requested by the operation (see
- * %G_FILE_DISK_USAGE_APPARENT_SIZE).
- *
- * The frequency of the updates is implementation defined, but is
- * ideally about once every 200ms.
- *
- * The last progress callback may or may not be equal to the final
- * result.  Always check the async result to get the final value.
- *
- * Since: 2.38
- **/
-typedef void (* GFileMeasureProgressCallback) (gboolean reporting,
-                                               guint64  current_size,
-                                               guint64  num_dirs,
-                                               guint64  num_files,
-                                               gpointer user_data);
-
-/**
- * GIOSchedulerJobFunc:
- * @job: a #GIOSchedulerJob.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @user_data: the data to pass to callback function
- *
- * I/O Job function.
- *
- * Long-running jobs should periodically check the @cancellable
- * to see if they have been cancelled.
- *
- * Returns: %TRUE if this function should be called again to
- *    complete the job, %FALSE if the job is complete (or cancelled)
- **/
-typedef gboolean (*GIOSchedulerJobFunc) (GIOSchedulerJob *job,
-					 GCancellable    *cancellable,
-					 gpointer         user_data);
-
-/**
- * GSimpleAsyncThreadFunc:
- * @res: a #GSimpleAsyncResult.
- * @object: a #GObject.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- *
- * Simple thread function that runs an asynchronous operation and
- * checks for cancellation.
- **/
-typedef void (*GSimpleAsyncThreadFunc) (GSimpleAsyncResult *res,
-                                        GObject *object,
-                                        GCancellable *cancellable);
-
-/**
- * GSocketSourceFunc:
- * @socket: the #GSocket
- * @condition: the current condition at the source fired.
- * @user_data: data passed in by the user.
- *
- * This is the function type of the callback used for the #GSource
- * returned by g_socket_create_source().
- *
- * Returns: it should return %FALSE if the source should be removed.
- *
- * Since: 2.22
- */
-typedef gboolean (*GSocketSourceFunc) (GSocket *socket,
-				       GIOCondition condition,
-				       gpointer user_data);
-
-/**
- * GInputVector:
- * @buffer: Pointer to a buffer where data will be written.
- * @size: the available size in @buffer.
- *
- * Structure used for scatter/gather data input.
- * You generally pass in an array of #GInputVector<!-- -->s
- * and the operation will store the read data starting in the
- * first buffer, switching to the next as needed.
- *
- * Since: 2.22
- */
-typedef struct _GInputVector GInputVector;
-
-struct _GInputVector {
-  gpointer buffer;
-  gsize size;
-};
-
-/**
- * GOutputVector:
- * @buffer: Pointer to a buffer of data to read.
- * @size: the size of @buffer.
- *
- * Structure used for scatter/gather data output.
- * You generally pass in an array of #GOutputVector<!-- -->s
- * and the operation will use all the buffers as if they were
- * one buffer.
- *
- * Since: 2.22
- */
-typedef struct _GOutputVector GOutputVector;
-
-struct _GOutputVector {
-  gconstpointer buffer;
-  gsize size;
-};
-
-typedef struct _GCredentials                  GCredentials;
-typedef struct _GUnixCredentialsMessage       GUnixCredentialsMessage;
-typedef struct _GUnixFDList                   GUnixFDList;
-typedef struct _GDBusMessage                  GDBusMessage;
-typedef struct _GDBusConnection               GDBusConnection;
-typedef struct _GDBusProxy                    GDBusProxy;
-typedef struct _GDBusMethodInvocation         GDBusMethodInvocation;
-typedef struct _GDBusServer                   GDBusServer;
-typedef struct _GDBusAuthObserver             GDBusAuthObserver;
-typedef struct _GDBusErrorEntry               GDBusErrorEntry;
-typedef struct _GDBusInterfaceVTable          GDBusInterfaceVTable;
-typedef struct _GDBusSubtreeVTable            GDBusSubtreeVTable;
-typedef struct _GDBusAnnotationInfo           GDBusAnnotationInfo;
-typedef struct _GDBusArgInfo                  GDBusArgInfo;
-typedef struct _GDBusMethodInfo               GDBusMethodInfo;
-typedef struct _GDBusSignalInfo               GDBusSignalInfo;
-typedef struct _GDBusPropertyInfo             GDBusPropertyInfo;
-typedef struct _GDBusInterfaceInfo            GDBusInterfaceInfo;
-typedef struct _GDBusNodeInfo                 GDBusNodeInfo;
-
-/**
- * GCancellableSourceFunc:
- * @cancellable: the #GCancellable
- * @user_data: data passed in by the user.
- *
- * This is the function type of the callback used for the #GSource
- * returned by g_cancellable_source_new().
- *
- * Returns: it should return %FALSE if the source should be removed.
- *
- * Since: 2.28
- */
-typedef gboolean (*GCancellableSourceFunc) (GCancellable *cancellable,
-					    gpointer      user_data);
-
-/**
- * GPollableSourceFunc:
- * @pollable_stream: the #GPollableInputStream or #GPollableOutputStream
- * @user_data: data passed in by the user.
- *
- * This is the function type of the callback used for the #GSource
- * returned by g_pollable_input_stream_create_source() and
- * g_pollable_output_stream_create_source().
- *
- * Returns: it should return %FALSE if the source should be removed.
- *
- * Since: 2.28
- */
-typedef gboolean (*GPollableSourceFunc) (GObject  *pollable_stream,
-					 gpointer  user_data);
-
-typedef struct _GDBusInterface              GDBusInterface; /* Dummy typedef */
-typedef struct _GDBusInterfaceSkeleton      GDBusInterfaceSkeleton;
-typedef struct _GDBusObject                 GDBusObject;  /* Dummy typedef */
-typedef struct _GDBusObjectSkeleton         GDBusObjectSkeleton;
-typedef struct _GDBusObjectProxy            GDBusObjectProxy;
-typedef struct _GDBusObjectManager          GDBusObjectManager;  /* Dummy typedef */
-typedef struct _GDBusObjectManagerClient    GDBusObjectManagerClient;
-typedef struct _GDBusObjectManagerServer    GDBusObjectManagerServer;
-
-/**
- * GDBusProxyTypeFunc:
- * @manager: A #GDBusObjectManagerClient.
- * @object_path: The object path of the remote object.
- * @interface_name: (allow-none): The interface name of the remote object or %NULL if a #GDBusObjectProxy #GType is requested.
- * @user_data: User data.
- *
- * Function signature for a function used to determine the #GType to
- * use for an interface proxy (if @interface_name is not %NULL) or
- * object proxy (if @interface_name is %NULL).
- *
- * This function is called in the
- * <link linkend="g-main-context-push-thread-default">thread-default main loop</link>
- * that @manager was constructed in.
- *
- * Returns: A #GType to use for the remote object. The returned type
- *   must be a #GDBusProxy<!-- -->- or #GDBusObjectProxy<!-- -->-derived
- *   type.
- *
- * Since: 2.30
- */
-typedef GType (*GDBusProxyTypeFunc) (GDBusObjectManagerClient   *manager,
-                                     const gchar                *object_path,
-                                     const gchar                *interface_name,
-                                     gpointer                    user_data);
-
-typedef struct _GTestDBus GTestDBus;
-
-G_END_DECLS
-
-#endif /* __GIO_TYPES_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gloadableicon.h b/linux-x86/include/glib-2.0/gio/gloadableicon.h
deleted file mode 100644
index 5bdece8..0000000
--- a/linux-x86/include/glib-2.0/gio/gloadableicon.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_LOADABLE_ICON_H__
-#define __G_LOADABLE_ICON_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_LOADABLE_ICON            (g_loadable_icon_get_type ())
-#define G_LOADABLE_ICON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_LOADABLE_ICON, GLoadableIcon))
-#define G_IS_LOADABLE_ICON(obj)	        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_LOADABLE_ICON))
-#define G_LOADABLE_ICON_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_LOADABLE_ICON, GLoadableIconIface))
-
-/**
- * GLoadableIcon:
- *
- * Generic type for all kinds of icons that can be loaded
- * as a stream.
- **/
-typedef struct _GLoadableIconIface    		GLoadableIconIface;
-
-/**
- * GLoadableIconIface:
- * @g_iface: The parent interface.
- * @load: Loads an icon.
- * @load_async: Loads an icon asynchronously.
- * @load_finish: Finishes an asynchronous icon load.
- *
- * Interface for icons that can be loaded as a stream.
- **/
-struct _GLoadableIconIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GInputStream * (* load)        (GLoadableIcon       *icon,
-                                  int                  size,
-                                  char               **type,
-                                  GCancellable        *cancellable,
-                                  GError             **error);
-  void           (* load_async)  (GLoadableIcon       *icon,
-                                  int                  size,
-                                  GCancellable        *cancellable,
-                                  GAsyncReadyCallback  callback,
-                                  gpointer             user_data);
-  GInputStream * (* load_finish) (GLoadableIcon       *icon,
-                                  GAsyncResult        *res,
-                                  char               **type,
-                                  GError             **error);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType         g_loadable_icon_get_type    (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GInputStream *g_loadable_icon_load        (GLoadableIcon        *icon,
-					   int                   size,
-					   char                **type,
-					   GCancellable         *cancellable,
-					   GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void          g_loadable_icon_load_async  (GLoadableIcon        *icon,
-					   int                   size,
-					   GCancellable         *cancellable,
-					   GAsyncReadyCallback   callback,
-					   gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GInputStream *g_loadable_icon_load_finish (GLoadableIcon        *icon,
-					   GAsyncResult         *res,
-					   char                **type,
-					   GError              **error);
-
-G_END_DECLS
-
-#endif /* __G_LOADABLE_ICON_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gmemoryinputstream.h b/linux-x86/include/glib-2.0/gio/gmemoryinputstream.h
deleted file mode 100644
index 607c4bb..0000000
--- a/linux-x86/include/glib-2.0/gio/gmemoryinputstream.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#ifndef __G_MEMORY_INPUT_STREAM_H__
-#define __G_MEMORY_INPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/ginputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MEMORY_INPUT_STREAM         (g_memory_input_stream_get_type ())
-#define G_MEMORY_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MEMORY_INPUT_STREAM, GMemoryInputStream))
-#define G_MEMORY_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_MEMORY_INPUT_STREAM, GMemoryInputStreamClass))
-#define G_IS_MEMORY_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_MEMORY_INPUT_STREAM))
-#define G_IS_MEMORY_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_MEMORY_INPUT_STREAM))
-#define G_MEMORY_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_MEMORY_INPUT_STREAM, GMemoryInputStreamClass))
-
-/**
- * GMemoryInputStream:
- *
- * Implements #GInputStream for arbitrary memory chunks.
- **/
-typedef struct _GMemoryInputStreamClass    GMemoryInputStreamClass;
-typedef struct _GMemoryInputStreamPrivate  GMemoryInputStreamPrivate;
-
-struct _GMemoryInputStream
-{
-  GInputStream parent_instance;
-
-  /*< private >*/
-  GMemoryInputStreamPrivate *priv;
-};
-
-struct _GMemoryInputStreamClass
-{
-  GInputStreamClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-
-GLIB_AVAILABLE_IN_ALL
-GType          g_memory_input_stream_get_type      (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GInputStream * g_memory_input_stream_new           (void);
-GLIB_AVAILABLE_IN_ALL
-GInputStream * g_memory_input_stream_new_from_data (const void         *data,
-                                                    gssize              len,
-                                                    GDestroyNotify      destroy);
-GLIB_AVAILABLE_IN_2_34
-GInputStream * g_memory_input_stream_new_from_bytes (GBytes            *bytes);
-
-GLIB_AVAILABLE_IN_ALL
-void           g_memory_input_stream_add_data      (GMemoryInputStream *stream,
-                                                    const void         *data,
-                                                    gssize              len,
-                                                    GDestroyNotify      destroy);
-GLIB_AVAILABLE_IN_2_34
-void           g_memory_input_stream_add_bytes     (GMemoryInputStream     *stream,
-						    GBytes                 *bytes);
-
-G_END_DECLS
-
-#endif /* __G_MEMORY_INPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gmemoryoutputstream.h b/linux-x86/include/glib-2.0/gio/gmemoryoutputstream.h
deleted file mode 100644
index b95d101..0000000
--- a/linux-x86/include/glib-2.0/gio/gmemoryoutputstream.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#ifndef __G_MEMORY_OUTPUT_STREAM_H__
-#define __G_MEMORY_OUTPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/goutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MEMORY_OUTPUT_STREAM         (g_memory_output_stream_get_type ())
-#define G_MEMORY_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MEMORY_OUTPUT_STREAM, GMemoryOutputStream))
-#define G_MEMORY_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_MEMORY_OUTPUT_STREAM, GMemoryOutputStreamClass))
-#define G_IS_MEMORY_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_MEMORY_OUTPUT_STREAM))
-#define G_IS_MEMORY_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_MEMORY_OUTPUT_STREAM))
-#define G_MEMORY_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_MEMORY_OUTPUT_STREAM, GMemoryOutputStreamClass))
-
-/**
- * GMemoryOutputStream:
- *
- * Implements #GOutputStream for arbitrary memory chunks.
- **/
-typedef struct _GMemoryOutputStreamClass    GMemoryOutputStreamClass;
-typedef struct _GMemoryOutputStreamPrivate  GMemoryOutputStreamPrivate;
-
-struct _GMemoryOutputStream
-{
-  GOutputStream parent_instance;
-
-  /*< private >*/
-  GMemoryOutputStreamPrivate *priv;
-};
-
-struct _GMemoryOutputStreamClass
-{
-  GOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-/**
- * GReallocFunc:
- * @data: memory block to reallocate
- * @size: size to reallocate @data to
- *
- * Changes the size of the memory block pointed to by @data to
- * @size bytes.
- *
- * The function should have the same semantics as realloc().
- *
- * Returns: a pointer to the reallocated memory
- */
-typedef gpointer (* GReallocFunc) (gpointer data,
-                                   gsize    size);
-
-GLIB_AVAILABLE_IN_ALL
-GType          g_memory_output_stream_get_type      (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GOutputStream *g_memory_output_stream_new           (gpointer             data,
-                                                     gsize                size,
-                                                     GReallocFunc         realloc_function,
-                                                     GDestroyNotify       destroy_function);
-GLIB_AVAILABLE_IN_2_36
-GOutputStream *g_memory_output_stream_new_resizable (void);
-GLIB_AVAILABLE_IN_ALL
-gpointer       g_memory_output_stream_get_data      (GMemoryOutputStream *ostream);
-GLIB_AVAILABLE_IN_ALL
-gsize          g_memory_output_stream_get_size      (GMemoryOutputStream *ostream);
-GLIB_AVAILABLE_IN_ALL
-gsize          g_memory_output_stream_get_data_size (GMemoryOutputStream *ostream);
-GLIB_AVAILABLE_IN_ALL
-gpointer       g_memory_output_stream_steal_data    (GMemoryOutputStream *ostream);
-
-GLIB_AVAILABLE_IN_2_34
-GBytes *       g_memory_output_stream_steal_as_bytes (GMemoryOutputStream *ostream);
-
-G_END_DECLS
-
-#endif /* __G_MEMORY_OUTPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gmenu.h b/linux-x86/include/glib-2.0/gio/gmenu.h
deleted file mode 100644
index 68a974f..0000000
--- a/linux-x86/include/glib-2.0/gio/gmenu.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_MENU_H__
-#define __G_MENU_H__
-
-#include <gio/gmenumodel.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MENU          (g_menu_get_type ())
-#define G_MENU(inst)         (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-                              G_TYPE_MENU, GMenu))
-#define G_IS_MENU(inst)      (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
-                              G_TYPE_MENU))
-
-#define G_TYPE_MENU_ITEM     (g_menu_item_get_type ())
-#define G_MENU_ITEM(inst)    (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-                              G_TYPE_MENU_ITEM, GMenuItem))
-#define G_IS_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
-                              G_TYPE_MENU_ITEM))
-
-typedef struct _GMenuItem GMenuItem;
-typedef struct _GMenu     GMenu;
-
-GLIB_AVAILABLE_IN_2_32
-GType       g_menu_get_type                         (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
-GMenu *     g_menu_new                              (void);
-
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_freeze                           (GMenu       *menu);
-
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_insert_item                      (GMenu       *menu,
-                                                     gint         position,
-                                                     GMenuItem   *item);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_prepend_item                     (GMenu       *menu,
-                                                     GMenuItem   *item);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_append_item                      (GMenu       *menu,
-                                                     GMenuItem   *item);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_remove                           (GMenu       *menu,
-                                                     gint         position);
-
-GLIB_AVAILABLE_IN_2_38
-void        g_menu_remove_all                       (GMenu       *menu);
-
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_insert                           (GMenu       *menu,
-                                                     gint         position,
-                                                     const gchar *label,
-                                                     const gchar *detailed_action);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_prepend                          (GMenu       *menu,
-                                                     const gchar *label,
-                                                     const gchar *detailed_action);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_append                           (GMenu       *menu,
-                                                     const gchar *label,
-                                                     const gchar *detailed_action);
-
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_insert_section                   (GMenu       *menu,
-                                                     gint         position,
-                                                     const gchar *label,
-                                                     GMenuModel  *section);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_prepend_section                  (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *section);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_append_section                   (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *section);
-
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_insert_submenu                   (GMenu       *menu,
-                                                     gint        position,
-                                                     const gchar *label,
-                                                     GMenuModel  *submenu);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_prepend_submenu                  (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *submenu);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_append_submenu                   (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *submenu);
-
-
-GLIB_AVAILABLE_IN_2_32
-GType       g_menu_item_get_type                    (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
-GMenuItem * g_menu_item_new                         (const gchar *label,
-                                                     const gchar *detailed_action);
-
-GLIB_AVAILABLE_IN_2_34
-GMenuItem * g_menu_item_new_from_model              (GMenuModel  *model,
-                                                     gint         item_index);
-
-GLIB_AVAILABLE_IN_2_32
-GMenuItem * g_menu_item_new_submenu                 (const gchar *label,
-                                                     GMenuModel  *submenu);
-
-GLIB_AVAILABLE_IN_2_32
-GMenuItem * g_menu_item_new_section                 (const gchar *label,
-                                                     GMenuModel  *section);
-
-GLIB_AVAILABLE_IN_2_34
-GVariant *  g_menu_item_get_attribute_value         (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     const GVariantType *expected_type);
-GLIB_AVAILABLE_IN_2_34
-gboolean    g_menu_item_get_attribute               (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     const gchar *format_string,
-                                                     ...);
-GLIB_AVAILABLE_IN_2_34
-GMenuModel *g_menu_item_get_link                    (GMenuItem   *menu_item,
-                                                     const gchar *link);
-
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_item_set_attribute_value         (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     GVariant    *value);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_item_set_attribute               (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     const gchar *format_string,
-                                                     ...);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_item_set_link                    (GMenuItem   *menu_item,
-                                                     const gchar *link,
-                                                     GMenuModel  *model);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_item_set_label                   (GMenuItem   *menu_item,
-                                                     const gchar *label);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_item_set_submenu                 (GMenuItem   *menu_item,
-                                                     GMenuModel  *submenu);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_item_set_section                 (GMenuItem   *menu_item,
-                                                     GMenuModel  *section);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_item_set_action_and_target_value (GMenuItem   *menu_item,
-                                                     const gchar *action,
-                                                     GVariant    *target_value);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_item_set_action_and_target       (GMenuItem   *menu_item,
-                                                     const gchar *action,
-                                                     const gchar *format_string,
-                                                     ...);
-GLIB_AVAILABLE_IN_2_32
-void        g_menu_item_set_detailed_action         (GMenuItem   *menu_item,
-                                                     const gchar *detailed_action);
-
-GLIB_AVAILABLE_IN_2_38
-void        g_menu_item_set_icon                    (GMenuItem   *menu_item,
-                                                     GIcon       *icon);
-
-G_END_DECLS
-
-#endif /* __G_MENU_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gmenuexporter.h b/linux-x86/include/glib-2.0/gio/gmenuexporter.h
deleted file mode 100644
index 1673b22..0000000
--- a/linux-x86/include/glib-2.0/gio/gmenuexporter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- *  This library is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2 of the
- *  licence, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- *  USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_MENU_EXPORTER_H__
-#define __G_MENU_EXPORTER_H__
-
-#include <gio/gdbusconnection.h>
-#include <gio/gmenumodel.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_2_32
-guint                   g_dbus_connection_export_menu_model             (GDBusConnection  *connection,
-                                                                         const gchar      *object_path,
-                                                                         GMenuModel       *menu,
-                                                                         GError          **error);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_dbus_connection_unexport_menu_model           (GDBusConnection  *connection,
-                                                                         guint             export_id);
-
-G_END_DECLS
-
-#endif /* __G_MENU_EXPORTER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gmenumodel.h b/linux-x86/include/glib-2.0/gio/gmenumodel.h
deleted file mode 100644
index 7a2e27e..0000000
--- a/linux-x86/include/glib-2.0/gio/gmenumodel.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_MENU_MODEL_H__
-#define __G_MENU_MODEL_H__
-
-#include <glib-object.h>
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_MENU_ATTRIBUTE_ACTION:
- *
- * The menu item attribute which holds the action name of the item.  Action
- * names are namespaced with an identifier for the action group in which the
- * action resides. For example, "win." for window-specific actions and "app."
- * for application-wide actions.
- *
- * See also g_menu_model_get_item_attribute() and g_menu_item_set_attribute().
- *
- * Since: 2.32
- **/
-#define G_MENU_ATTRIBUTE_ACTION "action"
-
-/**
- * G_MENU_ATTRIBUTE_ACTION_NAMESPACE:
- *
- * The menu item attribute that holds the namespace for all action names in
- * menus that are linked from this item.
- *
- * Since: 2.36
- **/
-#define G_MENU_ATTRIBUTE_ACTION_NAMESPACE "action-namespace"
-
-/**
- * G_MENU_ATTRIBUTE_TARGET:
- *
- * The menu item attribute which holds the target with which the item's action
- * will be activated.
- *
- * See also g_menu_item_set_action_and_target()
- *
- * Since: 2.32
- **/
-#define G_MENU_ATTRIBUTE_TARGET "target"
-
-/**
- * G_MENU_ATTRIBUTE_LABEL:
- *
- * The menu item attribute which holds the label of the item.
- *
- * Since: 2.32
- **/
-#define G_MENU_ATTRIBUTE_LABEL "label"
-
-/**
- * G_MENU_ATTRIBUTE_ICON:
- *
- * The menu item attribute which holds the icon of the item.
- *
- * The icon is stored in the format returned by g_icon_serialize().
- *
- * This attribute is intended only to represent 'noun' icons such as
- * favicons for a webpage, or application icons.  It should not be used
- * for 'verbs' (ie: stock icons).
- *
- * Since: 2.38
- **/
-#define G_MENU_ATTRIBUTE_ICON "icon"
-
-/**
- * G_MENU_LINK_SUBMENU:
- *
- * The name of the link that associates a menu item with a submenu.
- *
- * See also g_menu_item_set_link().
- *
- * Since: 2.32
- **/
-#define G_MENU_LINK_SUBMENU "submenu"
-
-/**
- * G_MENU_LINK_SECTION:
- *
- * The name of the link that associates a menu item with a section.  The linked
- * menu will usually be shown in place of the menu item, using the item's label
- * as a header.
- *
- * See also g_menu_item_set_link().
- *
- * Since: 2.32
- **/
-#define G_MENU_LINK_SECTION "section"
-
-#define G_TYPE_MENU_MODEL                                   (g_menu_model_get_type ())
-#define G_MENU_MODEL(inst)                                  (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_MENU_MODEL, GMenuModel))
-#define G_MENU_MODEL_CLASS(class)                           (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_MENU_MODEL, GMenuModelClass))
-#define G_IS_MENU_MODEL(inst)                               (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_MENU_MODEL))
-#define G_IS_MENU_MODEL_CLASS(class)                        (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_MENU_MODEL))
-#define G_MENU_MODEL_GET_CLASS(inst)                        (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_MENU_MODEL, GMenuModelClass))
-
-typedef struct _GMenuModelPrivate                           GMenuModelPrivate;
-typedef struct _GMenuModelClass                             GMenuModelClass;
-
-typedef struct _GMenuAttributeIterPrivate                   GMenuAttributeIterPrivate;
-typedef struct _GMenuAttributeIterClass                     GMenuAttributeIterClass;
-typedef struct _GMenuAttributeIter                          GMenuAttributeIter;
-
-typedef struct _GMenuLinkIterPrivate                        GMenuLinkIterPrivate;
-typedef struct _GMenuLinkIterClass                          GMenuLinkIterClass;
-typedef struct _GMenuLinkIter                               GMenuLinkIter;
-
-struct _GMenuModel
-{
-  GObject            parent_instance;
-  GMenuModelPrivate *priv;
-};
-
-/**
- * GMenuModelClass::get_item_attributes:
- * @model: the #GMenuModel to query
- * @item_index: The #GMenuItem to query
- * @attributes: (out) (element-type utf8 GLib.Variant): Attributes on the item
- *
- * Gets all the attributes associated with the item in the menu model.
- */
-/**
- * GMenuModelClass::get_item_links:
- * @model: the #GMenuModel to query
- * @item_index: The #GMenuItem to query
- * @links: (out) (element-type utf8 GLib.MenuModel): Links from the item
- *
- * Gets all the links associated with the item in the menu model.
- */
-struct _GMenuModelClass
-{
-  GObjectClass parent_class;
-
-  gboolean              (*is_mutable)                       (GMenuModel          *model);
-  gint                  (*get_n_items)                      (GMenuModel          *model);
-  void                  (*get_item_attributes)              (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             GHashTable         **attributes);
-  GMenuAttributeIter *  (*iterate_item_attributes)          (GMenuModel          *model,
-                                                             gint                 item_index);
-  GVariant *            (*get_item_attribute_value)         (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             const gchar         *attribute,
-                                                             const GVariantType  *expected_type);
-  void                  (*get_item_links)                   (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             GHashTable         **links);
-  GMenuLinkIter *       (*iterate_item_links)               (GMenuModel          *model,
-                                                             gint                 item_index);
-  GMenuModel *          (*get_item_link)                    (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             const gchar         *link);
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType                   g_menu_model_get_type                           (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_menu_model_is_mutable                         (GMenuModel         *model);
-GLIB_AVAILABLE_IN_2_32
-gint                    g_menu_model_get_n_items                        (GMenuModel         *model);
-
-GLIB_AVAILABLE_IN_2_32
-GMenuAttributeIter *    g_menu_model_iterate_item_attributes            (GMenuModel         *model,
-                                                                         gint                item_index);
-GLIB_AVAILABLE_IN_2_32
-GVariant *              g_menu_model_get_item_attribute_value           (GMenuModel         *model,
-                                                                         gint                item_index,
-                                                                         const gchar        *attribute,
-                                                                         const GVariantType *expected_type);
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_menu_model_get_item_attribute                 (GMenuModel         *model,
-                                                                         gint                item_index,
-                                                                         const gchar        *attribute,
-                                                                         const gchar        *format_string,
-                                                                         ...);
-GLIB_AVAILABLE_IN_2_32
-GMenuLinkIter *         g_menu_model_iterate_item_links                 (GMenuModel         *model,
-                                                                         gint                item_index);
-GLIB_AVAILABLE_IN_2_32
-GMenuModel *            g_menu_model_get_item_link                      (GMenuModel         *model,
-                                                                         gint                item_index,
-                                                                         const gchar        *link);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_menu_model_items_changed                      (GMenuModel         *model,
-                                                                         gint                position,
-                                                                         gint                removed,
-                                                                         gint                added);
-
-
-#define G_TYPE_MENU_ATTRIBUTE_ITER                          (g_menu_attribute_iter_get_type ())
-#define G_MENU_ATTRIBUTE_ITER(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER, GMenuAttributeIter))
-#define G_MENU_ATTRIBUTE_ITER_CLASS(class)                  (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER, GMenuAttributeIterClass))
-#define G_IS_MENU_ATTRIBUTE_ITER(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER))
-#define G_IS_MENU_ATTRIBUTE_ITER_CLASS(class)               (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER))
-#define G_MENU_ATTRIBUTE_ITER_GET_CLASS(inst)               (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER, GMenuAttributeIterClass))
-
-struct _GMenuAttributeIter
-{
-  GObject parent_instance;
-  GMenuAttributeIterPrivate *priv;
-};
-
-struct _GMenuAttributeIterClass
-{
-  GObjectClass parent_class;
-
-  gboolean      (*get_next) (GMenuAttributeIter  *iter,
-                             const gchar        **out_name,
-                             GVariant           **value);
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType                   g_menu_attribute_iter_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_menu_attribute_iter_get_next                  (GMenuAttributeIter  *iter,
-                                                                         const gchar        **out_name,
-                                                                         GVariant           **value);
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_menu_attribute_iter_next                      (GMenuAttributeIter  *iter);
-GLIB_AVAILABLE_IN_2_32
-const gchar *           g_menu_attribute_iter_get_name                  (GMenuAttributeIter  *iter);
-GLIB_AVAILABLE_IN_2_32
-GVariant *              g_menu_attribute_iter_get_value                 (GMenuAttributeIter  *iter);
-
-
-#define G_TYPE_MENU_LINK_ITER                               (g_menu_link_iter_get_type ())
-#define G_MENU_LINK_ITER(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_MENU_LINK_ITER, GMenuLinkIter))
-#define G_MENU_LINK_ITER_CLASS(class)                       (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_MENU_LINK_ITER, GMenuLinkIterClass))
-#define G_IS_MENU_LINK_ITER(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_MENU_LINK_ITER))
-#define G_IS_MENU_LINK_ITER_CLASS(class)                    (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_MENU_LINK_ITER))
-#define G_MENU_LINK_ITER_GET_CLASS(inst)                    (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_MENU_LINK_ITER, GMenuLinkIterClass))
-
-struct _GMenuLinkIter
-{
-  GObject parent_instance;
-  GMenuLinkIterPrivate *priv;
-};
-
-struct _GMenuLinkIterClass
-{
-  GObjectClass parent_class;
-
-  gboolean      (*get_next) (GMenuLinkIter  *iter,
-                             const gchar   **out_link,
-                             GMenuModel    **value);
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType                   g_menu_link_iter_get_type                       (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_menu_link_iter_get_next                       (GMenuLinkIter  *iter,
-                                                                         const gchar   **out_link,
-                                                                         GMenuModel    **value);
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_menu_link_iter_next                           (GMenuLinkIter  *iter);
-GLIB_AVAILABLE_IN_2_32
-const gchar *           g_menu_link_iter_get_name                       (GMenuLinkIter  *iter);
-GLIB_AVAILABLE_IN_2_32
-GMenuModel *            g_menu_link_iter_get_value                      (GMenuLinkIter  *iter);
-
-G_END_DECLS
-
-#endif /* __G_MENU_MODEL_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gmount.h b/linux-x86/include/glib-2.0/gio/gmount.h
deleted file mode 100644
index 58f5193..0000000
--- a/linux-x86/include/glib-2.0/gio/gmount.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_MOUNT_H__
-#define __G_MOUNT_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MOUNT            (g_mount_get_type ())
-#define G_MOUNT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_MOUNT, GMount))
-#define G_IS_MOUNT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_MOUNT))
-#define G_MOUNT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_MOUNT, GMountIface))
-
-typedef struct _GMountIface    GMountIface;
-
-/**
- * GMountIface:
- * @g_iface: The parent interface.
- * @changed: Changed signal that is emitted when the mount's state has changed.
- * @unmounted: The unmounted signal that is emitted when the #GMount have been unmounted. If the recipient is holding references to the object they should release them so the object can be finalized.
- * @pre_unmount: The ::pre-unmount signal that is emitted when the #GMount will soon be emitted. If the recipient is somehow holding the mount open by keeping an open file on it it should close the file.
- * @get_root: Gets a #GFile to the root directory of the #GMount.
- * @get_name: Gets a string containing the name of the #GMount.
- * @get_icon: Gets a #GIcon for the #GMount.
- * @get_uuid: Gets the UUID for the #GMount. The reference is typically based on the file system UUID for the mount in question and should be considered an opaque string. Returns %NULL if there is no UUID available.
- * @get_volume: Gets a #GVolume the mount is located on. Returns %NULL if the #GMount is not associated with a #GVolume.
- * @get_drive: Gets a #GDrive the volume of the mount is located on. Returns %NULL if the #GMount is not associated with a #GDrive or a #GVolume. This is convenience method for getting the #GVolume and using that to get the #GDrive.
- * @can_unmount: Checks if a #GMount can be unmounted.
- * @can_eject: Checks if a #GMount can be ejected.
- * @unmount: Starts unmounting a #GMount.
- * @unmount_finish: Finishes an unmounting operation.
- * @eject: Starts ejecting a #GMount.
- * @eject_finish: Finishes an eject operation.
- * @remount: Starts remounting a #GMount.
- * @remount_finish: Finishes a remounting operation.
- * @guess_content_type: Starts guessing the type of the content of a #GMount.
- *     See g_mount_guess_content_type() for more information on content
- *     type guessing. This operation was added in 2.18.
- * @guess_content_type_finish: Finishes a content type guessing operation. Added in 2.18.
- * @guess_content_type_sync: Synchronous variant of @guess_content_type. Added in 2.18
- * @unmount_with_operation: Starts unmounting a #GMount using a #GMountOperation. Since 2.22.
- * @unmount_with_operation_finish: Finishes an unmounting operation using a #GMountOperation. Since 2.22.
- * @eject_with_operation: Starts ejecting a #GMount using a #GMountOperation. Since 2.22.
- * @eject_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @get_default_location: Gets a #GFile indication a start location that can be use as the entry point for this mount. Since 2.24.
- * @get_sort_key: Gets a key used for sorting #GMount instance or %NULL if no such key exists. Since 2.32.
- * @get_symbolic_icon: Gets a symbolic #GIcon for the #GMount. Since 2.34.
- *
- * Interface for implementing operations for mounts.
- **/
-struct _GMountIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-
-  void        (* changed)                   (GMount              *mount);
-  void        (* unmounted)                 (GMount              *mount);
-
-  /* Virtual Table */
-
-  GFile     * (* get_root)                  (GMount              *mount);
-  char      * (* get_name)                  (GMount              *mount);
-  GIcon     * (* get_icon)                  (GMount              *mount);
-  char      * (* get_uuid)                  (GMount              *mount);
-  GVolume   * (* get_volume)                (GMount              *mount);
-  GDrive    * (* get_drive)                 (GMount              *mount);
-  gboolean    (* can_unmount)               (GMount              *mount);
-  gboolean    (* can_eject)                 (GMount              *mount);
-
-  void        (* unmount)                   (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* unmount_finish)            (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* eject)                     (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_finish)              (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* remount)                   (GMount              *mount,
-                                             GMountMountFlags     flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* remount_finish)            (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* guess_content_type)        (GMount              *mount,
-                                             gboolean             force_rescan,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gchar    ** (* guess_content_type_finish) (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-  gchar    ** (* guess_content_type_sync)   (GMount              *mount,
-                                             gboolean             force_rescan,
-                                             GCancellable        *cancellable,
-                                             GError             **error);
-
-  /* Signal, not VFunc */
-  void        (* pre_unmount)               (GMount              *mount);
-
-  void        (* unmount_with_operation)    (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* unmount_with_operation_finish) (GMount          *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* eject_with_operation)      (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_with_operation_finish) (GMount            *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-  GFile     * (* get_default_location)      (GMount              *mount);
-
-  const gchar * (* get_sort_key)            (GMount              *mount);
-  GIcon       * (* get_symbolic_icon)       (GMount              *mount);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType       g_mount_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GFile     * g_mount_get_root                  (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-GFile     * g_mount_get_default_location      (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-char      * g_mount_get_name                  (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-GIcon     * g_mount_get_icon                  (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-GIcon     * g_mount_get_symbolic_icon         (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-char      * g_mount_get_uuid                  (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-GVolume   * g_mount_get_volume                (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-GDrive    * g_mount_get_drive                 (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_mount_can_unmount               (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_mount_can_eject                 (GMount              *mount);
-
-GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation)
-void        g_mount_unmount                   (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-
-GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation_finish)
-gboolean    g_mount_unmount_finish            (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_DEPRECATED_FOR(g_mount_eject_with_operation)
-void        g_mount_eject                     (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-
-GLIB_DEPRECATED_FOR(g_mount_eject_with_operation_finish)
-gboolean    g_mount_eject_finish              (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_ALL
-void        g_mount_remount                   (GMount              *mount,
-                                               GMountMountFlags     flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_mount_remount_finish            (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_ALL
-void        g_mount_guess_content_type        (GMount              *mount,
-                                               gboolean             force_rescan,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gchar    ** g_mount_guess_content_type_finish (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gchar    ** g_mount_guess_content_type_sync   (GMount              *mount,
-                                               gboolean             force_rescan,
-                                               GCancellable        *cancellable,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_mount_is_shadowed               (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-void        g_mount_shadow                    (GMount              *mount);
-GLIB_AVAILABLE_IN_ALL
-void        g_mount_unshadow                  (GMount              *mount);
-
-GLIB_AVAILABLE_IN_ALL
-void        g_mount_unmount_with_operation    (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_mount_unmount_with_operation_finish (GMount          *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_ALL
-void        g_mount_eject_with_operation      (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_mount_eject_with_operation_finish (GMount            *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_mount_get_sort_key             (GMount              *mount);
-
-G_END_DECLS
-
-#endif /* __G_MOUNT_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gmountoperation.h b/linux-x86/include/glib-2.0/gio/gmountoperation.h
deleted file mode 100644
index 7f8baf1..0000000
--- a/linux-x86/include/glib-2.0/gio/gmountoperation.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_MOUNT_OPERATION_H__
-#define __G_MOUNT_OPERATION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MOUNT_OPERATION         (g_mount_operation_get_type ())
-#define G_MOUNT_OPERATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MOUNT_OPERATION, GMountOperation))
-#define G_MOUNT_OPERATION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_MOUNT_OPERATION, GMountOperationClass))
-#define G_IS_MOUNT_OPERATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_MOUNT_OPERATION))
-#define G_IS_MOUNT_OPERATION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_MOUNT_OPERATION))
-#define G_MOUNT_OPERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_MOUNT_OPERATION, GMountOperationClass))
-
-/**
- * GMountOperation:
- *
- * Class for providing authentication methods for mounting operations,
- * such as mounting a file locally, or authenticating with a server.
- **/
-typedef struct _GMountOperationClass   GMountOperationClass;
-typedef struct _GMountOperationPrivate GMountOperationPrivate;
-
-struct _GMountOperation
-{
-  GObject parent_instance;
-
-  GMountOperationPrivate *priv;
-};
-
-struct _GMountOperationClass
-{
-  GObjectClass parent_class;
-
-  /* signals: */
-
-  void (* ask_password) (GMountOperation       *op,
-			 const char            *message,
-			 const char            *default_user,
-			 const char            *default_domain,
-			 GAskPasswordFlags      flags);
-
-  void (* ask_question) (GMountOperation       *op,
-			 const char            *message,
-			 const char            *choices[]);
-
-  void (* reply)        (GMountOperation       *op,
-			 GMountOperationResult  result);
-
-  void (* aborted)      (GMountOperation       *op);
-
-  void (* show_processes) (GMountOperation      *op,
-                           const gchar          *message,
-                           GArray               *processes,
-                           const gchar          *choices[]);
-
-  void (* show_unmount_progress) (GMountOperation *op,
-                                  const gchar     *message,
-                                  gint64           time_left,
-                                  gint64           bytes_left);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-  void (*_g_reserved9) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType             g_mount_operation_get_type      (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GMountOperation * g_mount_operation_new           (void);
-
-GLIB_AVAILABLE_IN_ALL
-const char *  g_mount_operation_get_username      (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
-void          g_mount_operation_set_username      (GMountOperation *op,
-						   const char      *username);
-GLIB_AVAILABLE_IN_ALL
-const char *  g_mount_operation_get_password      (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
-void          g_mount_operation_set_password      (GMountOperation *op,
-						   const char      *password);
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_mount_operation_get_anonymous     (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
-void          g_mount_operation_set_anonymous     (GMountOperation *op,
-						   gboolean         anonymous);
-GLIB_AVAILABLE_IN_ALL
-const char *  g_mount_operation_get_domain        (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
-void          g_mount_operation_set_domain        (GMountOperation *op,
-						   const char      *domain);
-GLIB_AVAILABLE_IN_ALL
-GPasswordSave g_mount_operation_get_password_save (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
-void          g_mount_operation_set_password_save (GMountOperation *op,
-						   GPasswordSave    save);
-GLIB_AVAILABLE_IN_ALL
-int           g_mount_operation_get_choice        (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
-void          g_mount_operation_set_choice        (GMountOperation *op,
-						   int              choice);
-GLIB_AVAILABLE_IN_ALL
-void          g_mount_operation_reply             (GMountOperation *op,
-						   GMountOperationResult result);
-
-G_END_DECLS
-
-#endif /* __G_MOUNT_OPERATION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gnativevolumemonitor.h b/linux-x86/include/glib-2.0/gio/gnativevolumemonitor.h
deleted file mode 100644
index e7f6d62..0000000
--- a/linux-x86/include/glib-2.0/gio/gnativevolumemonitor.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_NATIVE_VOLUME_MONITOR_H__
-#define __G_NATIVE_VOLUME_MONITOR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gvolumemonitor.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_NATIVE_VOLUME_MONITOR        (g_native_volume_monitor_get_type ())
-#define G_NATIVE_VOLUME_MONITOR(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NATIVE_VOLUME_MONITOR, GNativeVolumeMonitor))
-#define G_NATIVE_VOLUME_MONITOR_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_NATIVE_VOLUME_MONITOR, GNativeVolumeMonitorClass))
-#define G_IS_NATIVE_VOLUME_MONITOR(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NATIVE_VOLUME_MONITOR))
-#define G_IS_NATIVE_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_NATIVE_VOLUME_MONITOR))
-
-#define G_NATIVE_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-native-volume-monitor"
-
-typedef struct _GNativeVolumeMonitor      GNativeVolumeMonitor;
-typedef struct _GNativeVolumeMonitorClass GNativeVolumeMonitorClass;
-
-struct _GNativeVolumeMonitor
-{
-  GVolumeMonitor parent_instance;
-};
-
-struct _GNativeVolumeMonitorClass
-{
-  GVolumeMonitorClass parent_class;
-
-  GMount * (* get_mount_for_mount_path) (const char   *mount_path,
-                                         GCancellable *cancellable);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType g_native_volume_monitor_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_NATIVE_VOLUME_MONITOR_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gnetworkaddress.h b/linux-x86/include/glib-2.0/gio/gnetworkaddress.h
deleted file mode 100644
index 326ab21..0000000
--- a/linux-x86/include/glib-2.0/gio/gnetworkaddress.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_NETWORK_ADDRESS_H__
-#define __G_NETWORK_ADDRESS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_NETWORK_ADDRESS         (g_network_address_get_type ())
-#define G_NETWORK_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NETWORK_ADDRESS, GNetworkAddress))
-#define G_NETWORK_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_NETWORK_ADDRESS, GNetworkAddressClass))
-#define G_IS_NETWORK_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NETWORK_ADDRESS))
-#define G_IS_NETWORK_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_NETWORK_ADDRESS))
-#define G_NETWORK_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_NETWORK_ADDRESS, GNetworkAddressClass))
-
-typedef struct _GNetworkAddressClass   GNetworkAddressClass;
-typedef struct _GNetworkAddressPrivate GNetworkAddressPrivate;
-
-struct _GNetworkAddress
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GNetworkAddressPrivate *priv;
-};
-
-struct _GNetworkAddressClass
-{
-  GObjectClass parent_class;
-
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType               g_network_address_get_type     (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketConnectable *g_network_address_new          (const gchar      *hostname,
-						    guint16           port);
-GLIB_AVAILABLE_IN_ALL
-GSocketConnectable *g_network_address_parse        (const gchar      *host_and_port,
-						    guint16           default_port,
-						    GError          **error);
-GLIB_AVAILABLE_IN_ALL
-GSocketConnectable *g_network_address_parse_uri    (const gchar      *uri,
-    						    guint16           default_port,
-						    GError          **error);
-GLIB_AVAILABLE_IN_ALL
-const gchar        *g_network_address_get_hostname (GNetworkAddress  *addr);
-GLIB_AVAILABLE_IN_ALL
-guint16             g_network_address_get_port     (GNetworkAddress  *addr);
-GLIB_AVAILABLE_IN_ALL
-const gchar        *g_network_address_get_scheme   (GNetworkAddress  *addr);
-
-
-G_END_DECLS
-
-#endif /* __G_NETWORK_ADDRESS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gnetworking.h b/linux-x86/include/glib-2.0/gio/gnetworking.h
deleted file mode 100644
index c81e0e6..0000000
--- a/linux-x86/include/glib-2.0/gio/gnetworking.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008-2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_NETWORKING_H__
-#define __G_NETWORKING_H__
-
-#include <glib.h>
-
-#ifdef G_OS_WIN32
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
-#include <winsock2.h>
-#undef interface
-#include <ws2tcpip.h>
-#include <windns.h>
-#include <mswsock.h>
-
-#include <iphlpapi.h>
-
-#else /* !G_OS_WIN32 */
-
-#include <sys/types.h>
-
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <resolv.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <net/if.h>
-
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-
-#ifndef T_SRV
-#define T_SRV 33
-#endif
-
-#ifndef _PATH_RESCONF
-#define _PATH_RESCONF "/etc/resolv.conf"
-#endif
-
-#ifndef CMSG_LEN
-/* CMSG_LEN and CMSG_SPACE are defined by RFC 2292, but missing on
- * some older platforms.
- */
-#define CMSG_LEN(len) ((size_t)CMSG_DATA((struct cmsghdr *)NULL) + (len))
-
-/* CMSG_SPACE must add at least as much padding as CMSG_NXTHDR()
- * adds. We overestimate here.
- */
-#define GLIB_ALIGN_TO_SIZEOF(len, obj) (((len) + sizeof (obj) - 1) & ~(sizeof (obj) - 1))
-#define CMSG_SPACE(len) GLIB_ALIGN_TO_SIZEOF (CMSG_LEN (len), struct cmsghdr)
-#endif
-#endif
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_2_36
-void g_networking_init (void);
-
-G_END_DECLS
-
-#endif /* __G_NETWORKING_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gnetworkmonitor.h b/linux-x86/include/glib-2.0/gio/gnetworkmonitor.h
deleted file mode 100644
index 373934e..0000000
--- a/linux-x86/include/glib-2.0/gio/gnetworkmonitor.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_NETWORK_MONITOR_H__
-#define __G_NETWORK_MONITOR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_NETWORK_MONITOR_EXTENSION_POINT_NAME:
- *
- * Extension point for network status monitoring functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- *
- * Since: 2.30
- */
-#define G_NETWORK_MONITOR_EXTENSION_POINT_NAME "gio-network-monitor"
-
-#define G_TYPE_NETWORK_MONITOR         (g_network_monitor_get_type ())
-#define G_NETWORK_MONITOR(o)               (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NETWORK_MONITOR, GNetworkMonitor))
-#define G_IS_NETWORK_MONITOR(o)            (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NETWORK_MONITOR))
-#define G_NETWORK_MONITOR_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), G_TYPE_NETWORK_MONITOR, GNetworkMonitorInterface))
-
-typedef struct _GNetworkMonitorInterface GNetworkMonitorInterface;
-
-struct _GNetworkMonitorInterface {
-  GTypeInterface g_iface;
-
-  void     (*network_changed)  (GNetworkMonitor      *monitor,
-				gboolean              available);
-
-  gboolean (*can_reach)        (GNetworkMonitor      *monitor,
-				GSocketConnectable   *connectable,
-				GCancellable         *cancellable,
-				GError              **error);
-  void     (*can_reach_async)  (GNetworkMonitor      *monitor,
-				GSocketConnectable   *connectable,
-				GCancellable         *cancellable,
-				GAsyncReadyCallback   callback,
-				gpointer              user_data);
-  gboolean (*can_reach_finish) (GNetworkMonitor      *monitor,
-				GAsyncResult         *result,
-				GError              **error);
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType            g_network_monitor_get_type              (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
-GNetworkMonitor *g_network_monitor_get_default           (void);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_network_monitor_get_network_available (GNetworkMonitor     *monitor);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_network_monitor_can_reach             (GNetworkMonitor     *monitor,
-							  GSocketConnectable  *connectable,
-							  GCancellable        *cancellable,
-							  GError             **error);
-GLIB_AVAILABLE_IN_ALL
-void             g_network_monitor_can_reach_async       (GNetworkMonitor     *monitor,
-							  GSocketConnectable  *connectable,
-							  GCancellable        *cancellable,
-							  GAsyncReadyCallback  callback,
-							  gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_network_monitor_can_reach_finish      (GNetworkMonitor     *monitor,
-							  GAsyncResult        *result,
-							  GError             **error);
-
-G_END_DECLS
-
-#endif /* __G_NETWORK_MONITOR_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gnetworkservice.h b/linux-x86/include/glib-2.0/gio/gnetworkservice.h
deleted file mode 100644
index 082166d..0000000
--- a/linux-x86/include/glib-2.0/gio/gnetworkservice.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_NETWORK_SERVICE_H__
-#define __G_NETWORK_SERVICE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_NETWORK_SERVICE         (g_network_service_get_type ())
-#define G_NETWORK_SERVICE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NETWORK_SERVICE, GNetworkService))
-#define G_NETWORK_SERVICE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_NETWORK_SERVICE, GNetworkServiceClass))
-#define G_IS_NETWORK_SERVICE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NETWORK_SERVICE))
-#define G_IS_NETWORK_SERVICE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_NETWORK_SERVICE))
-#define G_NETWORK_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_NETWORK_SERVICE, GNetworkServiceClass))
-
-typedef struct _GNetworkServiceClass   GNetworkServiceClass;
-typedef struct _GNetworkServicePrivate GNetworkServicePrivate;
-
-struct _GNetworkService
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GNetworkServicePrivate *priv;
-};
-
-struct _GNetworkServiceClass
-{
-  GObjectClass parent_class;
-
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                g_network_service_get_type      (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketConnectable  *g_network_service_new           (const gchar     *service,
-						      const gchar     *protocol,
-						      const gchar     *domain);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar         *g_network_service_get_service   (GNetworkService *srv);
-GLIB_AVAILABLE_IN_ALL
-const gchar         *g_network_service_get_protocol  (GNetworkService *srv);
-GLIB_AVAILABLE_IN_ALL
-const gchar         *g_network_service_get_domain    (GNetworkService *srv);
-GLIB_AVAILABLE_IN_ALL
-const gchar         *g_network_service_get_scheme    (GNetworkService *srv);
-GLIB_AVAILABLE_IN_ALL
-void                 g_network_service_set_scheme    (GNetworkService *srv, const gchar *scheme);
-
-G_END_DECLS
-
-#endif /* __G_NETWORK_SERVICE_H__ */
-
diff --git a/linux-x86/include/glib-2.0/gio/goutputstream.h b/linux-x86/include/glib-2.0/gio/goutputstream.h
deleted file mode 100644
index dd2cbad..0000000
--- a/linux-x86/include/glib-2.0/gio/goutputstream.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_OUTPUT_STREAM_H__
-#define __G_OUTPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_OUTPUT_STREAM         (g_output_stream_get_type ())
-#define G_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_OUTPUT_STREAM, GOutputStream))
-#define G_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_OUTPUT_STREAM, GOutputStreamClass))
-#define G_IS_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_OUTPUT_STREAM))
-#define G_IS_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_OUTPUT_STREAM))
-#define G_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_OUTPUT_STREAM, GOutputStreamClass))
-
-/**
- * GOutputStream:
- *
- * Base class for writing output.
- *
- * All classes derived from GOutputStream should implement synchronous
- * writing, splicing, flushing and closing streams, but may implement
- * asynchronous versions.
- **/
-typedef struct _GOutputStreamClass    GOutputStreamClass;
-typedef struct _GOutputStreamPrivate  GOutputStreamPrivate;
-
-struct _GOutputStream
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GOutputStreamPrivate *priv;
-};
-
-
-struct _GOutputStreamClass
-{
-  GObjectClass parent_class;
-
-  /* Sync ops: */
-
-  gssize      (* write_fn)      (GOutputStream            *stream,
-                                 const void               *buffer,
-                                 gsize                     count,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-  gssize      (* splice)        (GOutputStream            *stream,
-                                 GInputStream             *source,
-                                 GOutputStreamSpliceFlags  flags,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-  gboolean    (* flush)	        (GOutputStream            *stream,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-  gboolean    (* close_fn)      (GOutputStream            *stream,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-
-  /* Async ops: (optional in derived classes) */
-
-  void        (* write_async)   (GOutputStream            *stream,
-                                 const void               *buffer,
-                                 gsize                     count,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gssize      (* write_finish)  (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-  void        (* splice_async)  (GOutputStream            *stream,
-                                 GInputStream             *source,
-                                 GOutputStreamSpliceFlags  flags,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gssize      (* splice_finish) (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-  void        (* flush_async)   (GOutputStream            *stream,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gboolean    (* flush_finish)  (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-  void        (* close_async)   (GOutputStream            *stream,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gboolean    (* close_finish)  (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_output_stream_get_type      (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gssize   g_output_stream_write         (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					GCancellable              *cancellable,
-					GError                   **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_output_stream_write_all     (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					gsize                     *bytes_written,
-					GCancellable              *cancellable,
-					GError                   **error);
-GLIB_AVAILABLE_IN_2_34
-gssize   g_output_stream_write_bytes   (GOutputStream             *stream,
-					GBytes                    *bytes,
-					GCancellable              *cancellable,
-					GError                   **error);
-GLIB_AVAILABLE_IN_ALL
-gssize   g_output_stream_splice        (GOutputStream             *stream,
-					GInputStream              *source,
-					GOutputStreamSpliceFlags   flags,
-					GCancellable              *cancellable,
-					GError                   **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_output_stream_flush         (GOutputStream             *stream,
-					GCancellable              *cancellable,
-					GError                   **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_output_stream_close         (GOutputStream             *stream,
-					GCancellable              *cancellable,
-					GError                   **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_output_stream_write_async   (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-GLIB_AVAILABLE_IN_ALL
-gssize   g_output_stream_write_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-GLIB_AVAILABLE_IN_2_34
-void     g_output_stream_write_bytes_async  (GOutputStream             *stream,
-					     GBytes                    *bytes,
-					     int                        io_priority,
-					     GCancellable              *cancellable,
-					     GAsyncReadyCallback        callback,
-					     gpointer                   user_data);
-GLIB_AVAILABLE_IN_2_34
-gssize   g_output_stream_write_bytes_finish (GOutputStream             *stream,
-					     GAsyncResult              *result,
-					     GError                   **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_output_stream_splice_async  (GOutputStream             *stream,
-					GInputStream              *source,
-					GOutputStreamSpliceFlags   flags,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-GLIB_AVAILABLE_IN_ALL
-gssize   g_output_stream_splice_finish (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_output_stream_flush_async   (GOutputStream             *stream,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_output_stream_flush_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_output_stream_close_async   (GOutputStream             *stream,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_output_stream_close_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_output_stream_is_closed     (GOutputStream             *stream);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_output_stream_is_closing    (GOutputStream             *stream);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_output_stream_has_pending   (GOutputStream             *stream);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_output_stream_set_pending   (GOutputStream             *stream,
-					GError                   **error);
-GLIB_AVAILABLE_IN_ALL
-void     g_output_stream_clear_pending (GOutputStream             *stream);
-
-
-G_END_DECLS
-
-#endif /* __G_OUTPUT_STREAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gpermission.h b/linux-x86/include/glib-2.0/gio/gpermission.h
deleted file mode 100644
index 49c2991..0000000
--- a/linux-x86/include/glib-2.0/gio/gpermission.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_PERMISSION_H__
-#define __G_PERMISSION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PERMISSION             (g_permission_get_type ())
-#define G_PERMISSION(inst)            (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
-                                       G_TYPE_PERMISSION, GPermission))
-#define G_PERMISSION_CLASS(class)     (G_TYPE_CHECK_CLASS_CAST ((class),     \
-                                       G_TYPE_PERMISSION, GPermissionClass))
-#define G_IS_PERMISSION(inst)         (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
-                                       G_TYPE_PERMISSION))
-#define G_IS_PERMISSION_CLASS(class)  (G_TYPE_CHECK_CLASS_TYPE ((class),     \
-                                       G_TYPE_PERMISSION))
-#define G_PERMISSION_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst),    \
-                                       G_TYPE_PERMISSION, GPermissionClass))
-
-typedef struct _GPermissionPrivate    GPermissionPrivate;
-typedef struct _GPermissionClass      GPermissionClass;
-
-struct _GPermission
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GPermissionPrivate *priv;
-};
-
-struct _GPermissionClass {
-  GObjectClass parent_class;
-
-  gboolean (*acquire)        (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GError              **error);
-  void     (*acquire_async)  (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GAsyncReadyCallback   callback,
-                              gpointer              user_data);
-  gboolean (*acquire_finish) (GPermission          *permission,
-                              GAsyncResult         *result,
-                              GError              **error);
-
-  gboolean (*release)        (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GError              **error);
-  void     (*release_async)  (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GAsyncReadyCallback   callback,
-                              gpointer              user_data);
-  gboolean (*release_finish) (GPermission          *permission,
-                              GAsyncResult         *result,
-                              GError              **error);
-
-  gpointer reserved[16];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType           g_permission_get_type           (void);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_permission_acquire            (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void            g_permission_acquire_async      (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_permission_acquire_finish     (GPermission          *permission,
-                                                 GAsyncResult         *result,
-                                                 GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_permission_release            (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void            g_permission_release_async      (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_permission_release_finish     (GPermission          *permission,
-                                                 GAsyncResult         *result,
-                                                 GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_permission_get_allowed        (GPermission   *permission);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_permission_get_can_acquire    (GPermission   *permission);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_permission_get_can_release    (GPermission   *permission);
-
-GLIB_AVAILABLE_IN_ALL
-void            g_permission_impl_update        (GPermission  *permission,
-                                                 gboolean      allowed,
-                                                 gboolean      can_acquire,
-                                                 gboolean      can_release);
-
-G_END_DECLS
-
-#endif /* __G_PERMISSION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gpollableinputstream.h b/linux-x86/include/glib-2.0/gio/gpollableinputstream.h
deleted file mode 100644
index a0b1574..0000000
--- a/linux-x86/include/glib-2.0/gio/gpollableinputstream.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_POLLABLE_INPUT_STREAM_H__
-#define __G_POLLABLE_INPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_POLLABLE_INPUT_STREAM               (g_pollable_input_stream_get_type ())
-#define G_POLLABLE_INPUT_STREAM(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_POLLABLE_INPUT_STREAM, GPollableInputStream))
-#define G_IS_POLLABLE_INPUT_STREAM(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_POLLABLE_INPUT_STREAM))
-#define G_POLLABLE_INPUT_STREAM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_POLLABLE_INPUT_STREAM, GPollableInputStreamInterface))
-
-/**
- * GPollableInputStream:
- *
- * An interface for a #GInputStream that can be polled for readability.
- *
- * Since: 2.28
- */
-typedef struct _GPollableInputStreamInterface GPollableInputStreamInterface;
-
-/**
- * GPollableInputStreamInterface:
- * @g_iface: The parent interface.
- * @can_poll: Checks if the #GPollableInputStream instance is actually pollable
- * @is_readable: Checks if the stream is readable
- * @create_source: Creates a #GSource to poll the stream
- * @read_nonblocking: Does a non-blocking read or returns
- *   %G_IO_ERROR_WOULD_BLOCK
- *
- * The interface for pollable input streams.
- *
- * The default implementation of @can_poll always returns %TRUE.
- *
- * The default implementation of @read_nonblocking calls
- * g_pollable_input_stream_is_readable(), and then calls
- * g_input_stream_read() if it returns %TRUE. This means you only need
- * to override it if it is possible that your @is_readable
- * implementation may return %TRUE when the stream is not actually
- * readable.
- *
- * Since: 2.28
- */
-struct _GPollableInputStreamInterface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  gboolean     (*can_poll)         (GPollableInputStream  *stream);
-
-  gboolean     (*is_readable)      (GPollableInputStream  *stream);
-  GSource *    (*create_source)    (GPollableInputStream  *stream,
-				    GCancellable          *cancellable);
-  gssize       (*read_nonblocking) (GPollableInputStream  *stream,
-				    void                  *buffer,
-				    gsize                  count,
-				    GError               **error);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_pollable_input_stream_get_type         (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_pollable_input_stream_can_poll         (GPollableInputStream  *stream);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_pollable_input_stream_is_readable      (GPollableInputStream  *stream);
-GLIB_AVAILABLE_IN_ALL
-GSource *g_pollable_input_stream_create_source    (GPollableInputStream  *stream,
-						   GCancellable          *cancellable);
-
-GLIB_AVAILABLE_IN_ALL
-gssize   g_pollable_input_stream_read_nonblocking (GPollableInputStream  *stream,
-						   void                  *buffer,
-						   gsize                  count,
-						   GCancellable          *cancellable,
-						   GError               **error);
-
-G_END_DECLS
-
-
-#endif /* __G_POLLABLE_INPUT_STREAM_H__ */
-
diff --git a/linux-x86/include/glib-2.0/gio/gpollableoutputstream.h b/linux-x86/include/glib-2.0/gio/gpollableoutputstream.h
deleted file mode 100644
index b6b3e54..0000000
--- a/linux-x86/include/glib-2.0/gio/gpollableoutputstream.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_POLLABLE_OUTPUT_STREAM_H__
-#define __G_POLLABLE_OUTPUT_STREAM_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_POLLABLE_OUTPUT_STREAM               (g_pollable_output_stream_get_type ())
-#define G_POLLABLE_OUTPUT_STREAM(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_POLLABLE_OUTPUT_STREAM, GPollableOutputStream))
-#define G_IS_POLLABLE_OUTPUT_STREAM(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_POLLABLE_OUTPUT_STREAM))
-#define G_POLLABLE_OUTPUT_STREAM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_POLLABLE_OUTPUT_STREAM, GPollableOutputStreamInterface))
-
-/**
- * GPollableOutputStream:
- *
- * An interface for a #GOutputStream that can be polled for readability.
- *
- * Since: 2.28
- */
-typedef struct _GPollableOutputStreamInterface GPollableOutputStreamInterface;
-
-/**
- * GPollableOutputStreamInterface:
- * @g_iface: The parent interface.
- * @can_poll: Checks if the #GPollableOutputStream instance is actually pollable
- * @is_writable: Checks if the stream is writable
- * @create_source: Creates a #GSource to poll the stream
- * @write_nonblocking: Does a non-blocking write or returns
- *   %G_IO_ERROR_WOULD_BLOCK
- *
- * The interface for pollable output streams.
- *
- * The default implementation of @can_poll always returns %TRUE.
- *
- * The default implementation of @write_nonblocking calls
- * g_pollable_output_stream_is_writable(), and then calls
- * g_output_stream_write() if it returns %TRUE. This means you only
- * need to override it if it is possible that your @is_writable
- * implementation may return %TRUE when the stream is not actually
- * writable.
- *
- * Since: 2.28
- */
-struct _GPollableOutputStreamInterface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  gboolean     (*can_poll)          (GPollableOutputStream  *stream);
-
-  gboolean     (*is_writable)       (GPollableOutputStream  *stream);
-  GSource *    (*create_source)     (GPollableOutputStream  *stream,
-				     GCancellable           *cancellable);
-  gssize       (*write_nonblocking) (GPollableOutputStream  *stream,
-				     const void             *buffer,
-				     gsize                   count,
-				     GError                **error);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_pollable_output_stream_get_type          (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_pollable_output_stream_can_poll          (GPollableOutputStream  *stream);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_pollable_output_stream_is_writable       (GPollableOutputStream  *stream);
-GLIB_AVAILABLE_IN_ALL
-GSource *g_pollable_output_stream_create_source     (GPollableOutputStream  *stream,
-						     GCancellable           *cancellable);
-
-GLIB_AVAILABLE_IN_ALL
-gssize   g_pollable_output_stream_write_nonblocking (GPollableOutputStream  *stream,
-						     const void             *buffer,
-						     gsize                   count,
-						     GCancellable           *cancellable,
-						     GError                **error);
-
-G_END_DECLS
-
-
-#endif /* __G_POLLABLE_OUTPUT_STREAM_H__ */
-
diff --git a/linux-x86/include/glib-2.0/gio/gpollableutils.h b/linux-x86/include/glib-2.0/gio/gpollableutils.h
deleted file mode 100644
index cb4612d..0000000
--- a/linux-x86/include/glib-2.0/gio/gpollableutils.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_POLLABLE_UTILS_H__
-#define __G_POLLABLE_UTILS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-GSource *g_pollable_source_new       (GObject        *pollable_stream);
-
-GLIB_AVAILABLE_IN_2_34
-GSource *g_pollable_source_new_full  (gpointer        pollable_stream,
-				      GSource        *child_source,
-				      GCancellable   *cancellable);
-
-GLIB_AVAILABLE_IN_2_34
-gssize   g_pollable_stream_read      (GInputStream   *stream,
-				      void           *buffer,
-				      gsize           count,
-				      gboolean        blocking,
-				      GCancellable   *cancellable,
-				      GError        **error);
-
-GLIB_AVAILABLE_IN_2_34
-gssize   g_pollable_stream_write     (GOutputStream  *stream,
-				      const void     *buffer,
-				      gsize           count,
-				      gboolean        blocking,
-				      GCancellable   *cancellable,
-				      GError        **error);
-GLIB_AVAILABLE_IN_2_34
-gboolean g_pollable_stream_write_all (GOutputStream  *stream,
-				      const void     *buffer,
-				      gsize           count,
-				      gboolean        blocking,
-				      gsize          *bytes_written,
-				      GCancellable   *cancellable,
-				      GError        **error);
-
-G_END_DECLS
-
-#endif /* _G_POLLABLE_UTILS_H_ */
diff --git a/linux-x86/include/glib-2.0/gio/gpropertyaction.h b/linux-x86/include/glib-2.0/gio/gpropertyaction.h
deleted file mode 100644
index 3a43af8..0000000
--- a/linux-x86/include/glib-2.0/gio/gpropertyaction.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2013 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_PROPERTY_ACTION_H__
-#define __G_PROPERTY_ACTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROPERTY_ACTION                              (g_property_action_get_type ())
-#define G_PROPERTY_ACTION(inst)                             (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_PROPERTY_ACTION, GPropertyAction))
-#define G_IS_PROPERTY_ACTION(inst)                          (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_PROPERTY_ACTION))
-
-GLIB_AVAILABLE_IN_2_38
-GType                   g_property_action_get_type                      (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_38
-GPropertyAction *       g_property_action_new                           (const gchar *name,
-                                                                         gpointer     object,
-                                                                         const gchar *property_name);
-
-G_END_DECLS
-
-#endif /* __G_PROPERTY_ACTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gproxy.h b/linux-x86/include/glib-2.0/gio/gproxy.h
deleted file mode 100644
index b022335..0000000
--- a/linux-x86/include/glib-2.0/gio/gproxy.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#ifndef __G_PROXY_H__
-#define __G_PROXY_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY		(g_proxy_get_type ())
-#define G_PROXY(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY, GProxy))
-#define G_IS_PROXY(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY))
-#define G_PROXY_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_PROXY, GProxyInterface))
-
-/**
- * G_PROXY_EXTENSION_POINT_NAME:
- *
- * Extension point for proxy functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- *
- * Since: 2.26
- */
-#define G_PROXY_EXTENSION_POINT_NAME "gio-proxy"
-
-/**
- * GProxy:
- *
- * Interface that handles proxy connection and payload.
- *
- * Since: 2.26
- */
-typedef struct _GProxyInterface GProxyInterface;
-
-/**
- * GProxyInterface:
- * @g_iface: The parent interface.
- * @connect: Connect to proxy server and wrap (if required) the #connection
- *           to handle payload.
- * @connect_async: Same as connect() but asynchronous.
- * @connect_finish: Returns the result of connect_async()
- * @supports_hostname: Returns whether the proxy supports hostname lookups.
- *
- * Provides an interface for handling proxy connection and payload.
- *
- * Since: 2.26
- */
-struct _GProxyInterface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GIOStream * (* connect)           (GProxy               *proxy,
-				     GIOStream            *connection,
-				     GProxyAddress        *proxy_address,
-				     GCancellable         *cancellable,
-				     GError              **error);
-
-  void        (* connect_async)     (GProxy               *proxy,
-				     GIOStream            *connection,
-				     GProxyAddress	  *proxy_address,
-				     GCancellable         *cancellable,
-				     GAsyncReadyCallback   callback,
-				     gpointer              user_data);
-
-  GIOStream * (* connect_finish)    (GProxy               *proxy,
-				     GAsyncResult         *result,
-				     GError              **error);
-
-  gboolean    (* supports_hostname) (GProxy             *proxy);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType      g_proxy_get_type                 (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GProxy    *g_proxy_get_default_for_protocol (const gchar *protocol);
-
-GLIB_AVAILABLE_IN_ALL
-GIOStream *g_proxy_connect           (GProxy               *proxy,
-				      GIOStream            *connection,
-				      GProxyAddress        *proxy_address,
-				      GCancellable         *cancellable,
-				      GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-void       g_proxy_connect_async     (GProxy               *proxy,
-				      GIOStream            *connection,
-				      GProxyAddress        *proxy_address,
-				      GCancellable         *cancellable,
-				      GAsyncReadyCallback   callback,
-				      gpointer              user_data);
-
-GLIB_AVAILABLE_IN_ALL
-GIOStream *g_proxy_connect_finish    (GProxy               *proxy,
-				      GAsyncResult         *result,
-				      GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean   g_proxy_supports_hostname (GProxy               *proxy);
-
-G_END_DECLS
-
-#endif /* __G_PROXY_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gproxyaddress.h b/linux-x86/include/glib-2.0/gio/gproxyaddress.h
deleted file mode 100644
index ed67f33..0000000
--- a/linux-x86/include/glib-2.0/gio/gproxyaddress.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#ifndef __G_PROXY_ADDRESS_H__
-#define __G_PROXY_ADDRESS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/ginetsocketaddress.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY_ADDRESS         (g_proxy_address_get_type ())
-#define G_PROXY_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY_ADDRESS, GProxyAddress))
-#define G_PROXY_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_PROXY_ADDRESS, GProxyAddressClass))
-#define G_IS_PROXY_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY_ADDRESS))
-#define G_IS_PROXY_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_PROXY_ADDRESS))
-#define G_PROXY_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_PROXY_ADDRESS, GProxyAddressClass))
-
-typedef struct _GProxyAddressClass   GProxyAddressClass;
-typedef struct _GProxyAddressPrivate GProxyAddressPrivate;
-
-struct _GProxyAddress
-{
-  GInetSocketAddress parent_instance;
-
-  /*< private >*/
-  GProxyAddressPrivate *priv;
-};
-
-struct _GProxyAddressClass
-{
-  GInetSocketAddressClass parent_class;
-};
-
-
-GLIB_AVAILABLE_IN_ALL
-GType           g_proxy_address_get_type    (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress *g_proxy_address_new         (GInetAddress *inetaddr,
-					     guint16       port,
-					     const gchar  *protocol,
-					     const gchar  *dest_hostname,
-		                             guint16       dest_port,
-					     const gchar  *username,
-					     const gchar  *password);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar    *g_proxy_address_get_protocol                (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_2_34
-const gchar    *g_proxy_address_get_destination_protocol    (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_ALL
-const gchar    *g_proxy_address_get_destination_hostname    (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_ALL
-guint16         g_proxy_address_get_destination_port        (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_ALL
-const gchar    *g_proxy_address_get_username                (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_ALL
-const gchar    *g_proxy_address_get_password                (GProxyAddress *proxy);
-
-GLIB_AVAILABLE_IN_2_34
-const gchar    *g_proxy_address_get_uri                     (GProxyAddress *proxy);
-
-G_END_DECLS
-
-#endif /* __G_PROXY_ADDRESS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gproxyaddressenumerator.h b/linux-x86/include/glib-2.0/gio/gproxyaddressenumerator.h
deleted file mode 100644
index 19bcd51..0000000
--- a/linux-x86/include/glib-2.0/gio/gproxyaddressenumerator.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#ifndef __G_PROXY_ADDRESS_ENUMERATOR_H__
-#define __G_PROXY_ADDRESS_ENUMERATOR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gsocketaddressenumerator.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY_ADDRESS_ENUMERATOR         (g_proxy_address_enumerator_get_type ())
-#define G_PROXY_ADDRESS_ENUMERATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY_ADDRESS_ENUMERATOR, GProxyAddressEnumerator))
-#define G_PROXY_ADDRESS_ENUMERATOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_PROXY_ADDRESS_ENUMERATOR, GProxyAddressEnumeratorClass))
-#define G_IS_PROXY_ADDRESS_ENUMERATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY_ADDRESS_ENUMERATOR))
-#define G_IS_PROXY_ADDRESS_ENUMERATOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_PROXY_ADDRESS_ENUMERATOR))
-#define G_PROXY_ADDRESS_ENUMERATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_PROXY_ADDRESS_ENUMERATOR, GProxyAddressEnumeratorClass))
-
-/**
- * GProxyAddressEnumerator:
- *
- * A subclass of #GSocketAddressEnumerator that takes another address
- * enumerator and wraps its results in #GProxyAddress<!-- -->es as
- * directed by the default #GProxyResolver.
- */
-
-typedef struct _GProxyAddressEnumeratorClass GProxyAddressEnumeratorClass;
-typedef struct _GProxyAddressEnumeratorPrivate GProxyAddressEnumeratorPrivate;
-
-struct _GProxyAddressEnumerator
-{
-  GSocketAddressEnumerator parent_instance;
-  GProxyAddressEnumeratorPrivate *priv;
-};
-
-struct _GProxyAddressEnumeratorClass
-{
-  GSocketAddressEnumeratorClass parent_class;
-
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType           g_proxy_address_enumerator_get_type    (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_PROXY_ADDRESS_ENUMERATOR_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gproxyresolver.h b/linux-x86/include/glib-2.0/gio/gproxyresolver.h
deleted file mode 100644
index eaad834..0000000
--- a/linux-x86/include/glib-2.0/gio/gproxyresolver.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#ifndef __G_PROXY_RESOLVER_H__
-#define __G_PROXY_RESOLVER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY_RESOLVER         (g_proxy_resolver_get_type ())
-#define G_PROXY_RESOLVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY_RESOLVER, GProxyResolver))
-#define G_IS_PROXY_RESOLVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY_RESOLVER))
-#define G_PROXY_RESOLVER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), G_TYPE_PROXY_RESOLVER, GProxyResolverInterface))
-
-/**
- * G_PROXY_RESOLVER_EXTENSION_POINT_NAME:
- *
- * Extension point for proxy resolving functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_PROXY_RESOLVER_EXTENSION_POINT_NAME "gio-proxy-resolver"
-
-typedef struct _GProxyResolverInterface GProxyResolverInterface;
-
-struct _GProxyResolverInterface {
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  gboolean (* is_supported)  (GProxyResolver       *resolver);
-
-  gchar	** (* lookup)        (GProxyResolver       *resolver,
-			      const gchar          *uri,
-			      GCancellable         *cancellable,
-			      GError              **error);
-
-  void     (* lookup_async)  (GProxyResolver       *resolver,
-			      const gchar          *uri,
-			      GCancellable         *cancellable,
-			      GAsyncReadyCallback   callback,
-			      gpointer              user_data);
-
-  gchar	** (* lookup_finish) (GProxyResolver       *resolver,
-			      GAsyncResult         *result,
-			      GError              **error);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType		g_proxy_resolver_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GProxyResolver *g_proxy_resolver_get_default    (void);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_proxy_resolver_is_supported   (GProxyResolver       *resolver);
-GLIB_AVAILABLE_IN_ALL
-gchar	      **g_proxy_resolver_lookup		(GProxyResolver       *resolver,
-						 const gchar          *uri,
-						 GCancellable         *cancellable,
-						 GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void		g_proxy_resolver_lookup_async   (GProxyResolver       *resolver,
-						 const gchar          *uri,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gchar	      **g_proxy_resolver_lookup_finish  (GProxyResolver       *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-
-G_END_DECLS
-
-#endif /* __G_PROXY_RESOLVER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gremoteactiongroup.h b/linux-x86/include/glib-2.0/gio/gremoteactiongroup.h
deleted file mode 100644
index a9926ee..0000000
--- a/linux-x86/include/glib-2.0/gio/gremoteactiongroup.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_REMOTE_ACTION_GROUP_H__
-#define __G_REMOTE_ACTION_GROUP_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_REMOTE_ACTION_GROUP                          (g_remote_action_group_get_type ())
-#define G_REMOTE_ACTION_GROUP(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
-                                                             G_TYPE_REMOTE_ACTION_GROUP, GRemoteActionGroup))
-#define G_IS_REMOTE_ACTION_GROUP(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
-                                                             G_TYPE_REMOTE_ACTION_GROUP))
-#define G_REMOTE_ACTION_GROUP_GET_IFACE(inst)               (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                   \
-                                                             G_TYPE_REMOTE_ACTION_GROUP,                              \
-                                                             GRemoteActionGroupInterface))
-
-typedef struct _GRemoteActionGroupInterface                 GRemoteActionGroupInterface;
-
-struct _GRemoteActionGroupInterface
-{
-  GTypeInterface g_iface;
-
-  void (* activate_action_full)     (GRemoteActionGroup *remote,
-                                     const gchar        *action_name,
-                                     GVariant           *parameter,
-                                     GVariant           *platform_data);
-
-  void (* change_action_state_full) (GRemoteActionGroup *remote,
-                                     const gchar        *action_name,
-                                     GVariant           *value,
-                                     GVariant           *platform_data);
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType                   g_remote_action_group_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_remote_action_group_activate_action_full      (GRemoteActionGroup *remote,
-                                                                         const gchar        *action_name,
-                                                                         GVariant           *parameter,
-                                                                         GVariant           *platform_data);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_remote_action_group_change_action_state_full  (GRemoteActionGroup *remote,
-                                                                         const gchar        *action_name,
-                                                                         GVariant           *value,
-                                                                         GVariant           *platform_data);
-
-G_END_DECLS
-
-#endif /* __G_REMOTE_ACTION_GROUP_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gresolver.h b/linux-x86/include/glib-2.0/gio/gresolver.h
deleted file mode 100644
index 454896c..0000000
--- a/linux-x86/include/glib-2.0/gio/gresolver.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_RESOLVER_H__
-#define __G_RESOLVER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_RESOLVER         (g_resolver_get_type ())
-#define G_RESOLVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_RESOLVER, GResolver))
-#define G_RESOLVER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_RESOLVER, GResolverClass))
-#define G_IS_RESOLVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_RESOLVER))
-#define G_IS_RESOLVER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_RESOLVER))
-#define G_RESOLVER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_RESOLVER, GResolverClass))
-
-typedef struct _GResolverPrivate GResolverPrivate;
-typedef struct _GResolverClass   GResolverClass;
-
-struct _GResolver {
-  GObject parent_instance;
-
-  GResolverPrivate *priv;
-};
-
-struct _GResolverClass {
-  GObjectClass parent_class;
-
-  /* Signals */
-  void    ( *reload)                   (GResolver            *resolver);
-
-  /* Virtual methods */
-  GList * ( *lookup_by_name)           (GResolver            *resolver,
-					const gchar          *hostname,
-					GCancellable         *cancellable,
-					GError              **error);
-  void    ( *lookup_by_name_async)     (GResolver            *resolver,
-					const gchar          *hostname,
-					GCancellable         *cancellable,
-					GAsyncReadyCallback   callback,
-					gpointer              user_data);
-  GList * ( *lookup_by_name_finish)    (GResolver            *resolver,
-					GAsyncResult         *result,
-					GError              **error);
-
-  gchar * ( *lookup_by_address)        (GResolver            *resolver,
-					GInetAddress         *address,
-					GCancellable         *cancellable,
-					GError              **error);
-  void    ( *lookup_by_address_async)  (GResolver            *resolver,
-					GInetAddress         *address,
-					GCancellable         *cancellable,
-					GAsyncReadyCallback   callback,
-					gpointer              user_data);
-  gchar * ( *lookup_by_address_finish) (GResolver            *resolver,
-					GAsyncResult         *result,
-					GError              **error);
-
-  GList * ( *lookup_service)           (GResolver            *resolver,
-					const gchar          *rrname,
-					GCancellable         *cancellable,
-					GError              **error);
-  void    ( *lookup_service_async)     (GResolver            *resolver,
-					const gchar          *rrname,
-					GCancellable         *cancellable,
-					GAsyncReadyCallback   callback,
-					gpointer              user_data);
-  GList * ( *lookup_service_finish)    (GResolver            *resolver,
-					GAsyncResult         *result,
-					GError              **error);
-
-  GList * ( *lookup_records)           (GResolver            *resolver,
-                                        const gchar          *rrname,
-                                        GResolverRecordType   record_type,
-                                        GCancellable         *cancellable,
-                                        GError              **error);
-
-  void    ( *lookup_records_async)     (GResolver            *resolver,
-                                        const gchar          *rrname,
-                                        GResolverRecordType   record_type,
-                                        GCancellable         *cancellable,
-                                        GAsyncReadyCallback   callback,
-                                        gpointer              user_data);
-
-  GList * ( *lookup_records_finish)    (GResolver            *resolver,
-                                        GAsyncResult         *result,
-                                        GError              **error);
-
-  /* Padding for future expansion */
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType      g_resolver_get_type                  (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GResolver *g_resolver_get_default               (void);
-GLIB_AVAILABLE_IN_ALL
-void       g_resolver_set_default               (GResolver            *resolver);
-
-GLIB_AVAILABLE_IN_ALL
-GList     *g_resolver_lookup_by_name            (GResolver            *resolver,
-						 const gchar          *hostname,
-						 GCancellable         *cancellable,
-						 GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void       g_resolver_lookup_by_name_async      (GResolver            *resolver,
-						 const gchar          *hostname,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GList     *g_resolver_lookup_by_name_finish     (GResolver            *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-void       g_resolver_free_addresses            (GList                *addresses);
-
-GLIB_AVAILABLE_IN_ALL
-gchar     *g_resolver_lookup_by_address         (GResolver            *resolver,
-						 GInetAddress         *address,
-						 GCancellable         *cancellable,
-						 GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void       g_resolver_lookup_by_address_async   (GResolver            *resolver,
-						 GInetAddress         *address,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gchar     *g_resolver_lookup_by_address_finish  (GResolver            *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-GList     *g_resolver_lookup_service            (GResolver            *resolver,
-						 const gchar          *service,
-						 const gchar          *protocol,
-						 const gchar          *domain,
-						 GCancellable         *cancellable,
-						 GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void       g_resolver_lookup_service_async      (GResolver            *resolver,
-						 const gchar          *service,
-						 const gchar          *protocol,
-						 const gchar          *domain,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GList     *g_resolver_lookup_service_finish     (GResolver            *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-GLIB_AVAILABLE_IN_2_34
-GList     *g_resolver_lookup_records            (GResolver            *resolver,
-                                                 const gchar          *rrname,
-                                                 GResolverRecordType   record_type,
-                                                 GCancellable         *cancellable,
-                                                 GError              **error);
-GLIB_AVAILABLE_IN_2_34
-void       g_resolver_lookup_records_async      (GResolver            *resolver,
-                                                 const gchar          *rrname,
-                                                 GResolverRecordType   record_type,
-                                                 GCancellable         *cancellable,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data);
-GLIB_AVAILABLE_IN_2_34
-GList     *g_resolver_lookup_records_finish     (GResolver            *resolver,
-                                                 GAsyncResult         *result,
-                                                 GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-void       g_resolver_free_targets              (GList                *targets);
-
-/**
- * G_RESOLVER_ERROR:
- *
- * Error domain for #GResolver. Errors in this domain will be from the
- * #GResolverError enumeration. See #GError for more information on
- * error domains.
- */
-#define G_RESOLVER_ERROR (g_resolver_error_quark ())
-GLIB_AVAILABLE_IN_ALL
-GQuark g_resolver_error_quark (void);
-
-G_END_DECLS
-
-#endif /* __G_RESOLVER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gresource.h b/linux-x86/include/glib-2.0/gio/gresource.h
deleted file mode 100644
index 2db343c..0000000
--- a/linux-x86/include/glib-2.0/gio/gresource.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_RESOURCE_H__
-#define __G_RESOURCE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TYPE_RESOURCE:
- *
- * The #GType for #GResource.
- */
-#define G_TYPE_RESOURCE (g_resource_get_type ())
-
-
-/**
- * G_RESOURCE_ERROR:
- *
- * Error domain for #GResource. Errors in this domain will be from the
- * #GResourceError enumeration. See #GError for more information on
- * error domains.
- */
-#define G_RESOURCE_ERROR (g_resource_error_quark ())
-GLIB_AVAILABLE_IN_2_32
-GQuark g_resource_error_quark (void);
-
-typedef struct _GStaticResource GStaticResource;
-
-struct _GStaticResource {
-  const guint8 *data;
-  gsize data_len;
-  GResource *resource;
-  GStaticResource *next;
-  gpointer padding;
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType         g_resource_get_type            (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
-GResource *   g_resource_new_from_data       (GBytes                *data,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-GResource *   g_resource_ref                 (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-void          g_resource_unref               (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-GResource *   g_resource_load                (const gchar           *filename,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-GInputStream *g_resource_open_stream         (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-GBytes *      g_resource_lookup_data         (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-char **       g_resource_enumerate_children  (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean      g_resource_get_info            (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      gsize                 *size,
-					      guint32               *flags,
-					      GError               **error);
-
-GLIB_AVAILABLE_IN_2_32
-void          g_resources_register           (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-void          g_resources_unregister         (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-GInputStream *g_resources_open_stream        (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-GBytes *      g_resources_lookup_data        (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-char **       g_resources_enumerate_children (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean      g_resources_get_info           (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      gsize                 *size,
-					      guint32               *flags,
-					      GError               **error);
-
-
-GLIB_AVAILABLE_IN_2_32
-void          g_static_resource_init          (GStaticResource *static_resource);
-GLIB_AVAILABLE_IN_2_32
-void          g_static_resource_fini          (GStaticResource *static_resource);
-GLIB_AVAILABLE_IN_2_32
-GResource    *g_static_resource_get_resource  (GStaticResource *static_resource);
-
-G_END_DECLS
-
-#endif /* __G_RESOURCE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gseekable.h b/linux-x86/include/glib-2.0/gio/gseekable.h
deleted file mode 100644
index 245eb07..0000000
--- a/linux-x86/include/glib-2.0/gio/gseekable.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_SEEKABLE_H__
-#define __G_SEEKABLE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SEEKABLE            (g_seekable_get_type ())
-#define G_SEEKABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_SEEKABLE, GSeekable))
-#define G_IS_SEEKABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_SEEKABLE))
-#define G_SEEKABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_SEEKABLE, GSeekableIface))
-
-/**
- * GSeekable:
- *
- * Seek object for streaming operations.
- **/
-typedef struct _GSeekableIface   GSeekableIface;
-
-/**
- * GSeekableIface:
- * @g_iface: The parent interface.
- * @tell: Tells the current location within a stream.
- * @can_seek: Checks if seeking is supported by the stream.
- * @seek: Seeks to a location within a stream.
- * @can_truncate: Checks if truncation is supported by the stream.
- * @truncate_fn: Truncates a stream.
- *
- * Provides an interface for implementing seekable functionality on I/O Streams.
- **/
-struct _GSeekableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  goffset     (* tell)	         (GSeekable    *seekable);
-
-  gboolean    (* can_seek)       (GSeekable    *seekable);
-  gboolean    (* seek)	         (GSeekable    *seekable,
-				  goffset       offset,
-				  GSeekType     type,
-				  GCancellable *cancellable,
-				  GError      **error);
-
-  gboolean    (* can_truncate)   (GSeekable    *seekable);
-  gboolean    (* truncate_fn)    (GSeekable    *seekable,
-				  goffset       offset,
-				  GCancellable *cancellable,
-				  GError       **error);
-
-  /* TODO: Async seek/truncate */
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_seekable_get_type     (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-goffset  g_seekable_tell         (GSeekable     *seekable);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_seekable_can_seek     (GSeekable     *seekable);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_seekable_seek         (GSeekable     *seekable,
-				  goffset        offset,
-				  GSeekType      type,
-				  GCancellable  *cancellable,
-				  GError       **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_seekable_can_truncate (GSeekable     *seekable);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_seekable_truncate     (GSeekable     *seekable,
-				  goffset        offset,
-				  GCancellable  *cancellable,
-				  GError       **error);
-
-G_END_DECLS
-
-
-#endif /* __G_SEEKABLE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsettings.h b/linux-x86/include/glib-2.0/gio/gsettings.h
deleted file mode 100644
index e77e11e..0000000
--- a/linux-x86/include/glib-2.0/gio/gsettings.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_SETTINGS_H__
-#define __G_SETTINGS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gsettingsschema.h>
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SETTINGS                                     (g_settings_get_type ())
-#define G_SETTINGS(inst)                                    (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SETTINGS, GSettings))
-#define G_SETTINGS_CLASS(class)                             (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SETTINGS, GSettingsClass))
-#define G_IS_SETTINGS(inst)                                 (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_SETTINGS))
-#define G_IS_SETTINGS_CLASS(class)                          (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_SETTINGS))
-#define G_SETTINGS_GET_CLASS(inst)                          (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SETTINGS, GSettingsClass))
-
-typedef struct _GSettingsPrivate                            GSettingsPrivate;
-typedef struct _GSettingsClass                              GSettingsClass;
-
-struct _GSettingsClass
-{
-  GObjectClass parent_class;
-
-  /* Signals */
-  void        (*writable_changed)      (GSettings    *settings,
-                                        const gchar  *key);
-  void        (*changed)               (GSettings    *settings,
-                                        const gchar  *key);
-  gboolean    (*writable_change_event) (GSettings    *settings,
-                                        GQuark        key);
-  gboolean    (*change_event)          (GSettings    *settings,
-                                        const GQuark *keys,
-                                        gint          n_keys);
-
-  gpointer padding[20];
-};
-
-struct _GSettings
-{
-  GObject parent_instance;
-  GSettingsPrivate *priv;
-};
-
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_settings_get_type                             (void);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar * const *   g_settings_list_schemas                         (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar * const *   g_settings_list_relocatable_schemas             (void);
-GLIB_AVAILABLE_IN_ALL
-GSettings *             g_settings_new                                  (const gchar        *schema_id);
-GLIB_AVAILABLE_IN_ALL
-GSettings *             g_settings_new_with_path                        (const gchar        *schema_id,
-                                                                         const gchar        *path);
-GLIB_AVAILABLE_IN_ALL
-GSettings *             g_settings_new_with_backend                     (const gchar        *schema_id,
-                                                                         GSettingsBackend   *backend);
-GLIB_AVAILABLE_IN_ALL
-GSettings *             g_settings_new_with_backend_and_path            (const gchar        *schema_id,
-                                                                         GSettingsBackend   *backend,
-                                                                         const gchar        *path);
-GLIB_AVAILABLE_IN_2_32
-GSettings *             g_settings_new_full                             (GSettingsSchema    *schema,
-                                                                         GSettingsBackend   *backend,
-                                                                         const gchar        *path);
-GLIB_AVAILABLE_IN_ALL
-gchar **                g_settings_list_children                        (GSettings          *settings);
-GLIB_AVAILABLE_IN_ALL
-gchar **                g_settings_list_keys                            (GSettings          *settings);
-GLIB_AVAILABLE_IN_ALL
-GVariant *              g_settings_get_range                            (GSettings          *settings,
-                                                                         const gchar        *key);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_range_check                          (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         GVariant           *value);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_set_value                            (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         GVariant           *value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *              g_settings_get_value                            (GSettings          *settings,
-                                                                         const gchar        *key);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_set                                  (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar        *format,
-                                                                         ...);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_get                                  (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar        *format,
-                                                                         ...);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_reset                                (GSettings          *settings,
-                                                                         const gchar        *key);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_settings_get_int                              (GSettings          *settings,
-                                                                         const gchar        *key);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_set_int                              (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gint                value);
-GLIB_AVAILABLE_IN_2_32
-guint                   g_settings_get_uint                             (GSettings          *settings,
-                                                                         const gchar        *key);
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_settings_set_uint                             (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         guint               value);
-GLIB_AVAILABLE_IN_ALL
-gchar *                 g_settings_get_string                           (GSettings          *settings,
-                                                                         const gchar        *key);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_set_string                           (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar        *value);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_get_boolean                          (GSettings          *settings,
-                                                                         const gchar        *key);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_set_boolean                          (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gboolean            value);
-GLIB_AVAILABLE_IN_ALL
-gdouble                 g_settings_get_double                           (GSettings          *settings,
-                                                                         const gchar        *key);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_set_double                           (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gdouble             value);
-GLIB_AVAILABLE_IN_ALL
-gchar **                g_settings_get_strv                             (GSettings          *settings,
-                                                                         const gchar        *key);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_set_strv                             (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar *const *value);
-GLIB_AVAILABLE_IN_ALL
-gint                    g_settings_get_enum                             (GSettings          *settings,
-                                                                         const gchar        *key);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_set_enum                             (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gint                value);
-GLIB_AVAILABLE_IN_ALL
-guint                   g_settings_get_flags                            (GSettings          *settings,
-                                                                         const gchar        *key);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_set_flags                            (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         guint               value);
-GLIB_AVAILABLE_IN_ALL
-GSettings *             g_settings_get_child                            (GSettings          *settings,
-                                                                         const gchar        *name);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_is_writable                          (GSettings          *settings,
-                                                                         const gchar        *name);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_delay                                (GSettings          *settings);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_apply                                (GSettings          *settings);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_revert                               (GSettings          *settings);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_settings_get_has_unapplied                    (GSettings          *settings);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_sync                                 (void);
-
-/**
- * GSettingsBindSetMapping:
- * @value: a #GValue containing the property value to map
- * @expected_type: the #GVariantType to create
- * @user_data: user data that was specified when the binding was created
- *
- * The type for the function that is used to convert an object property
- * value to a #GVariant for storing it in #GSettings.
- *
- * Returns: a new #GVariant holding the data from @value,
- *     or %NULL in case of an error
- */
-typedef GVariant *    (*GSettingsBindSetMapping)                        (const GValue       *value,
-                                                                         const GVariantType *expected_type,
-                                                                         gpointer            user_data);
-
-/**
- * GSettingsBindGetMapping:
- * @value: return location for the property value
- * @variant: the #GVariant
- * @user_data: user data that was specified when the binding was created
- *
- * The type for the function that is used to convert from #GSettings to
- * an object property. The @value is already initialized to hold values
- * of the appropriate type.
- *
- * Returns: %TRUE if the conversion succeeded, %FALSE in case of an error
- */
-typedef gboolean      (*GSettingsBindGetMapping)                        (GValue             *value,
-                                                                         GVariant           *variant,
-                                                                         gpointer            user_data);
-
-/**
- * GSettingsGetMapping:
- * @value: the #GVariant to map, or %NULL
- * @result: (out): the result of the mapping
- * @user_data: (closure): the user data that was passed to
- * g_settings_get_mapped()
- *
- * The type of the function that is used to convert from a value stored
- * in a #GSettings to a value that is useful to the application.
- *
- * If the value is successfully mapped, the result should be stored at
- * @result and %TRUE returned.  If mapping fails (for example, if @value
- * is not in the right format) then %FALSE should be returned.
- *
- * If @value is %NULL then it means that the mapping function is being
- * given a "last chance" to successfully return a valid value.  %TRUE
- * must be returned in this case.
- *
- * Returns: %TRUE if the conversion succeeded, %FALSE in case of an error
- **/
-typedef gboolean      (*GSettingsGetMapping)                            (GVariant           *value,
-                                                                         gpointer           *result,
-                                                                         gpointer            user_data);
-
-/**
- * GSettingsBindFlags:
- * @G_SETTINGS_BIND_DEFAULT: Equivalent to <literal>G_SETTINGS_BIND_GET|G_SETTINGS_BIND_SET</literal>
- * @G_SETTINGS_BIND_GET: Update the #GObject property when the setting changes.
- *     It is an error to use this flag if the property is not writable.
- * @G_SETTINGS_BIND_SET: Update the setting when the #GObject property changes.
- *     It is an error to use this flag if the property is not readable.
- * @G_SETTINGS_BIND_NO_SENSITIVITY: Do not try to bind a "sensitivity" property to the writability of the setting
- * @G_SETTINGS_BIND_GET_NO_CHANGES: When set in addition to #G_SETTINGS_BIND_GET, set the #GObject property
- *     value initially from the setting, but do not listen for changes of the setting
- * @G_SETTINGS_BIND_INVERT_BOOLEAN: When passed to g_settings_bind(), uses a pair of mapping functions that invert
- *     the boolean value when mapping between the setting and the property.  The setting and property must both
- *     be booleans.  You cannot pass this flag to g_settings_bind_with_mapping().
- *
- * Flags used when creating a binding. These flags determine in which
- * direction the binding works. The default is to synchronize in both
- * directions.
- */
-typedef enum
-{
-  G_SETTINGS_BIND_DEFAULT,
-  G_SETTINGS_BIND_GET            = (1<<0),
-  G_SETTINGS_BIND_SET            = (1<<1),
-  G_SETTINGS_BIND_NO_SENSITIVITY = (1<<2),
-  G_SETTINGS_BIND_GET_NO_CHANGES = (1<<3),
-  G_SETTINGS_BIND_INVERT_BOOLEAN = (1<<4)
-} GSettingsBindFlags;
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_bind                                 (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         gpointer                 object,
-                                                                         const gchar             *property,
-                                                                         GSettingsBindFlags       flags);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_bind_with_mapping                    (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         gpointer                 object,
-                                                                         const gchar             *property,
-                                                                         GSettingsBindFlags       flags,
-                                                                         GSettingsBindGetMapping  get_mapping,
-                                                                         GSettingsBindSetMapping  set_mapping,
-                                                                         gpointer                 user_data,
-                                                                         GDestroyNotify           destroy);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_bind_writable                        (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         gpointer                 object,
-                                                                         const gchar             *property,
-                                                                         gboolean                 inverted);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_unbind                               (gpointer                 object,
-                                                                         const gchar             *property);
-
-GLIB_AVAILABLE_IN_2_32
-GAction *               g_settings_create_action                        (GSettings               *settings,
-                                                                         const gchar             *key);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer                g_settings_get_mapped                           (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         GSettingsGetMapping      mapping,
-                                                                         gpointer                 user_data);
-
-G_END_DECLS
-
-#endif  /* __G_SETTINGS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsettingsbackend.h b/linux-x86/include/glib-2.0/gio/gsettingsbackend.h
deleted file mode 100644
index 293ca65..0000000
--- a/linux-x86/include/glib-2.0/gio/gsettingsbackend.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright © 2009, 2010 Codethink Limited
- * Copyright © 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Matthias Clasen <mclasen@redhat.com>
- */
-
-#ifndef __G_SETTINGS_BACKEND_H__
-#define __G_SETTINGS_BACKEND_H__
-
-#if !defined (G_SETTINGS_ENABLE_BACKEND) && !defined (GIO_COMPILATION)
-#error "You must define G_SETTINGS_ENABLE_BACKEND before including <gio/gsettingsbackend.h>."
-#endif
-
-#define __GIO_GIO_H_INSIDE__
-#include <gio/giotypes.h>
-#undef __GIO_GIO_H_INSIDE__
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SETTINGS_BACKEND                             (g_settings_backend_get_type ())
-#define G_SETTINGS_BACKEND(inst)                            (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SETTINGS_BACKEND, GSettingsBackend))
-#define G_SETTINGS_BACKEND_CLASS(class)                     (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SETTINGS_BACKEND, GSettingsBackendClass))
-#define G_IS_SETTINGS_BACKEND(inst)                         (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SETTINGS_BACKEND))
-#define G_IS_SETTINGS_BACKEND_CLASS(class)                  (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SETTINGS_BACKEND))
-#define G_SETTINGS_BACKEND_GET_CLASS(inst)                  (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SETTINGS_BACKEND, GSettingsBackendClass))
-
-/**
- * G_SETTINGS_BACKEND_EXTENSION_POINT_NAME:
- *
- * Extension point for #GSettingsBackend functionality.
- **/
-#define G_SETTINGS_BACKEND_EXTENSION_POINT_NAME "gsettings-backend"
-
-/**
- * GSettingsBackend:
- *
- * An implementation of a settings storage repository.
- **/
-typedef struct _GSettingsBackendPrivate                     GSettingsBackendPrivate;
-typedef struct _GSettingsBackendClass                       GSettingsBackendClass;
-
-struct _GSettingsBackendClass
-{
-  GObjectClass parent_class;
-
-  GVariant *    (*read)             (GSettingsBackend    *backend,
-                                     const gchar         *key,
-                                     const GVariantType  *expected_type,
-                                     gboolean             default_value);
-
-  gboolean      (*get_writable)     (GSettingsBackend    *backend,
-                                     const gchar         *key);
-
-  gboolean      (*write)            (GSettingsBackend    *backend,
-                                     const gchar         *key,
-                                     GVariant            *value,
-                                     gpointer             origin_tag);
-  gboolean      (*write_tree)       (GSettingsBackend    *backend,
-                                     GTree               *tree,
-                                     gpointer             origin_tag);
-  void          (*reset)            (GSettingsBackend    *backend,
-                                     const gchar         *key,
-                                     gpointer             origin_tag);
-
-  void          (*subscribe)        (GSettingsBackend    *backend,
-                                     const gchar         *name);
-  void          (*unsubscribe)      (GSettingsBackend    *backend,
-                                     const gchar         *name);
-  void          (*sync)             (GSettingsBackend    *backend);
-
-  GPermission * (*get_permission)   (GSettingsBackend    *backend,
-                                     const gchar         *path);
-
-  gpointer padding[24];
-};
-
-struct _GSettingsBackend
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GSettingsBackendPrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_settings_backend_get_type                     (void);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_backend_changed                      (GSettingsBackend    *backend,
-                                                                         const gchar         *key,
-                                                                         gpointer             origin_tag);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_backend_path_changed                 (GSettingsBackend    *backend,
-                                                                         const gchar         *path,
-                                                                         gpointer             origin_tag);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_backend_flatten_tree                 (GTree               *tree,
-                                                                         gchar              **path,
-                                                                         const gchar       ***keys,
-                                                                         GVariant          ***values);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_backend_keys_changed                 (GSettingsBackend    *backend,
-                                                                         const gchar         *path,
-                                                                         gchar const * const *items,
-                                                                         gpointer             origin_tag);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_backend_path_writable_changed        (GSettingsBackend    *backend,
-                                                                         const gchar         *path);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_backend_writable_changed             (GSettingsBackend    *backend,
-                                                                         const gchar         *key);
-GLIB_AVAILABLE_IN_ALL
-void                    g_settings_backend_changed_tree                 (GSettingsBackend    *backend,
-                                                                         GTree               *tree,
-                                                                         gpointer             origin_tag);
-
-GLIB_AVAILABLE_IN_ALL
-GSettingsBackend *      g_settings_backend_get_default                  (void);
-
-GLIB_AVAILABLE_IN_ALL
-GSettingsBackend *      g_keyfile_settings_backend_new                  (const gchar         *filename,
-                                                                         const gchar         *root_path,
-                                                                         const gchar         *root_group);
-
-GLIB_AVAILABLE_IN_ALL
-GSettingsBackend *      g_null_settings_backend_new                     (void);
-
-GLIB_AVAILABLE_IN_ALL
-GSettingsBackend *      g_memory_settings_backend_new                   (void);
-
-G_END_DECLS
-
-#endif /* __G_SETTINGS_BACKEND_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsettingsschema.h b/linux-x86/include/glib-2.0/gio/gsettingsschema.h
deleted file mode 100644
index 20bf99f..0000000
--- a/linux-x86/include/glib-2.0/gio/gsettingsschema.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SETTINGS_SCHEMA_H__
-#define __G_SETTINGS_SCHEMA_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSettingsSchemaSource                       GSettingsSchemaSource;
-typedef struct _GSettingsSchema                             GSettingsSchema;
-
-#define                 G_TYPE_SETTINGS_SCHEMA_SOURCE                   (g_settings_schema_source_get_type ())
-GLIB_AVAILABLE_IN_2_32
-GType                   g_settings_schema_source_get_type               (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchemaSource * g_settings_schema_source_get_default            (void);
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchemaSource * g_settings_schema_source_ref                    (GSettingsSchemaSource  *source);
-GLIB_AVAILABLE_IN_2_32
-void                    g_settings_schema_source_unref                  (GSettingsSchemaSource  *source);
-
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchemaSource * g_settings_schema_source_new_from_directory     (const gchar            *directory,
-                                                                         GSettingsSchemaSource  *parent,
-                                                                         gboolean                trusted,
-                                                                         GError                **error);
-
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchema *       g_settings_schema_source_lookup                 (GSettingsSchemaSource  *source,
-                                                                         const gchar            *schema_id,
-                                                                         gboolean                recursive);
-
-#define                 G_TYPE_SETTINGS_SCHEMA                          (g_settings_schema_get_type ())
-GLIB_AVAILABLE_IN_2_32
-GType                   g_settings_schema_get_type                      (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchema *       g_settings_schema_ref                           (GSettingsSchema        *schema);
-GLIB_AVAILABLE_IN_2_32
-void                    g_settings_schema_unref                         (GSettingsSchema        *schema);
-
-GLIB_AVAILABLE_IN_2_32
-const gchar *           g_settings_schema_get_id                        (GSettingsSchema        *schema);
-GLIB_AVAILABLE_IN_2_32
-const gchar *           g_settings_schema_get_path                      (GSettingsSchema        *schema);
-
-G_END_DECLS
-
-#endif /* __G_SETTINGS_SCHEMA_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsimpleaction.h b/linux-x86/include/glib-2.0/gio/gsimpleaction.h
deleted file mode 100644
index b89b1a9..0000000
--- a/linux-x86/include/glib-2.0/gio/gsimpleaction.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_SIMPLE_ACTION_H__
-#define __G_SIMPLE_ACTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_ACTION                                (g_simple_action_get_type ())
-#define G_SIMPLE_ACTION(inst)                               (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION, GSimpleAction))
-#define G_IS_SIMPLE_ACTION(inst)                            (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION))
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_simple_action_get_type                        (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSimpleAction *         g_simple_action_new                             (const gchar        *name,
-                                                                         const GVariantType *parameter_type);
-
-GLIB_AVAILABLE_IN_ALL
-GSimpleAction *         g_simple_action_new_stateful                    (const gchar        *name,
-                                                                         const GVariantType *parameter_type,
-                                                                         GVariant           *state);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_simple_action_set_enabled                     (GSimpleAction      *simple,
-                                                                         gboolean            enabled);
-
-GLIB_AVAILABLE_IN_2_30
-void                    g_simple_action_set_state                       (GSimpleAction      *simple,
-                                                                         GVariant           *value);
-
-G_END_DECLS
-
-#endif /* __G_SIMPLE_ACTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsimpleactiongroup.h b/linux-x86/include/glib-2.0/gio/gsimpleactiongroup.h
deleted file mode 100644
index 197e30e..0000000
--- a/linux-x86/include/glib-2.0/gio/gsimpleactiongroup.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_SIMPLE_ACTION_GROUP_H__
-#define __G_SIMPLE_ACTION_GROUP_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include "gactiongroup.h"
-#include "gactionmap.h"
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_ACTION_GROUP                          (g_simple_action_group_get_type ())
-#define G_SIMPLE_ACTION_GROUP(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP, GSimpleActionGroup))
-#define G_SIMPLE_ACTION_GROUP_CLASS(class)                  (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP, GSimpleActionGroupClass))
-#define G_IS_SIMPLE_ACTION_GROUP(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP))
-#define G_IS_SIMPLE_ACTION_GROUP_CLASS(class)               (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP))
-#define G_SIMPLE_ACTION_GROUP_GET_CLASS(inst)               (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP, GSimpleActionGroupClass))
-
-typedef struct _GSimpleActionGroupPrivate                   GSimpleActionGroupPrivate;
-typedef struct _GSimpleActionGroupClass                     GSimpleActionGroupClass;
-
-/**
- * GSimpleActionGroup:
- *
- * The #GSimpleActionGroup structure contains private data and should only be accessed using the provided API.
- *
- * Since: 2.28
- */
-struct _GSimpleActionGroup
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GSimpleActionGroupPrivate *priv;
-};
-
-struct _GSimpleActionGroupClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< private >*/
-  gpointer padding[12];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_simple_action_group_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSimpleActionGroup *    g_simple_action_group_new                       (void);
-
-GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_lookup_action)
-GAction *               g_simple_action_group_lookup                    (GSimpleActionGroup *simple,
-                                                                         const gchar        *action_name);
-
-GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_add_action)
-void                    g_simple_action_group_insert                    (GSimpleActionGroup *simple,
-                                                                         GAction            *action);
-
-GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_remove_action)
-void                    g_simple_action_group_remove                    (GSimpleActionGroup *simple,
-                                                                         const gchar        *action_name);
-
-GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_add_action_entries)
-void                    g_simple_action_group_add_entries               (GSimpleActionGroup *simple,
-                                                                         const GActionEntry *entries,
-                                                                         gint                n_entries,
-                                                                         gpointer            user_data);
-
-G_END_DECLS
-
-#endif /* __G_SIMPLE_ACTION_GROUP_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsimpleasyncresult.h b/linux-x86/include/glib-2.0/gio/gsimpleasyncresult.h
deleted file mode 100644
index 7134f84..0000000
--- a/linux-x86/include/glib-2.0/gio/gsimpleasyncresult.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_SIMPLE_ASYNC_RESULT_H__
-#define __G_SIMPLE_ASYNC_RESULT_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_ASYNC_RESULT         (g_simple_async_result_get_type ())
-#define G_SIMPLE_ASYNC_RESULT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SIMPLE_ASYNC_RESULT, GSimpleAsyncResult))
-#define G_SIMPLE_ASYNC_RESULT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SIMPLE_ASYNC_RESULT, GSimpleAsyncResultClass))
-#define G_IS_SIMPLE_ASYNC_RESULT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SIMPLE_ASYNC_RESULT))
-#define G_IS_SIMPLE_ASYNC_RESULT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SIMPLE_ASYNC_RESULT))
-#define G_SIMPLE_ASYNC_RESULT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SIMPLE_ASYNC_RESULT, GSimpleAsyncResultClass))
-
-/**
- * GSimpleAsyncResult:
- *
- * A simple implementation of #GAsyncResult.
- **/
-typedef struct _GSimpleAsyncResultClass   GSimpleAsyncResultClass;
-
-
-GLIB_AVAILABLE_IN_ALL
-GType               g_simple_async_result_get_type         (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSimpleAsyncResult *g_simple_async_result_new              (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    gpointer                 source_tag);
-GLIB_AVAILABLE_IN_ALL
-GSimpleAsyncResult *g_simple_async_result_new_error        (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    ...) G_GNUC_PRINTF (6, 7);
-GLIB_AVAILABLE_IN_ALL
-GSimpleAsyncResult *g_simple_async_result_new_from_error   (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    const GError            *error);
-GLIB_AVAILABLE_IN_ALL
-GSimpleAsyncResult *g_simple_async_result_new_take_error   (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    GError                  *error);
-
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_set_op_res_gpointer (GSimpleAsyncResult      *simple,
-                                                               gpointer                 op_res,
-                                                               GDestroyNotify           destroy_op_res);
-GLIB_AVAILABLE_IN_ALL
-gpointer            g_simple_async_result_get_op_res_gpointer (GSimpleAsyncResult      *simple);
-
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_set_op_res_gssize   (GSimpleAsyncResult      *simple,
-                                                               gssize                   op_res);
-GLIB_AVAILABLE_IN_ALL
-gssize              g_simple_async_result_get_op_res_gssize   (GSimpleAsyncResult      *simple);
-
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_set_op_res_gboolean (GSimpleAsyncResult      *simple,
-                                                               gboolean                 op_res);
-GLIB_AVAILABLE_IN_ALL
-gboolean            g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResult      *simple);
-
-
-
-GLIB_AVAILABLE_IN_2_32
-void                g_simple_async_result_set_check_cancellable (GSimpleAsyncResult *simple,
-                                                                 GCancellable       *check_cancellable);
-GLIB_AVAILABLE_IN_ALL
-gpointer            g_simple_async_result_get_source_tag   (GSimpleAsyncResult      *simple);
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_set_handle_cancellation (GSimpleAsyncResult      *simple,
-								   gboolean          handle_cancellation);
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_complete         (GSimpleAsyncResult      *simple);
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_complete_in_idle (GSimpleAsyncResult      *simple);
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_run_in_thread    (GSimpleAsyncResult      *simple,
-							    GSimpleAsyncThreadFunc   func,
-							    int                      io_priority,
-							    GCancellable            *cancellable);
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_set_from_error   (GSimpleAsyncResult      *simple,
-							    const GError            *error);
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_take_error       (GSimpleAsyncResult      *simple,
-							    GError            *error);
-GLIB_AVAILABLE_IN_ALL
-gboolean            g_simple_async_result_propagate_error  (GSimpleAsyncResult      *simple,
-							    GError                 **dest);
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_set_error        (GSimpleAsyncResult      *simple,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    ...) G_GNUC_PRINTF (4, 5);
-GLIB_AVAILABLE_IN_ALL
-void                g_simple_async_result_set_error_va     (GSimpleAsyncResult      *simple,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    va_list                  args)
-							    G_GNUC_PRINTF(4, 0);
-GLIB_AVAILABLE_IN_ALL
-gboolean            g_simple_async_result_is_valid         (GAsyncResult            *result,
-                                                            GObject                 *source,
-                                                            gpointer                 source_tag);
-
-GLIB_AVAILABLE_IN_ALL
-void g_simple_async_report_error_in_idle  (GObject            *object,
-					   GAsyncReadyCallback callback,
-					   gpointer            user_data,
-					   GQuark              domain,
-					   gint                code,
-					   const char         *format,
-					   ...) G_GNUC_PRINTF(6, 7);
-GLIB_AVAILABLE_IN_ALL
-void g_simple_async_report_gerror_in_idle (GObject            *object,
-					   GAsyncReadyCallback callback,
-					   gpointer            user_data,
-					   const GError       *error);
-GLIB_AVAILABLE_IN_ALL
-void g_simple_async_report_take_gerror_in_idle (GObject            *object,
-                                                GAsyncReadyCallback callback,
-                                                gpointer            user_data,
-                                                GError             *error);
-
-G_END_DECLS
-
-
-
-#endif /* __G_SIMPLE_ASYNC_RESULT_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsimplepermission.h b/linux-x86/include/glib-2.0/gio/gsimplepermission.h
deleted file mode 100644
index 4cc336b..0000000
--- a/linux-x86/include/glib-2.0/gio/gsimplepermission.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_SIMPLE_PERMISSION_H__
-#define __G_SIMPLE_PERMISSION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_PERMISSION      (g_simple_permission_get_type ())
-#define G_SIMPLE_PERMISSION(inst)     (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
-                                       G_TYPE_SIMPLE_PERMISSION,             \
-                                       GSimplePermission))
-#define G_IS_SIMPLE_PERMISSION(inst)  (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
-                                       G_TYPE_SIMPLE_PERMISSION))
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_simple_permission_get_type            (void);
-GLIB_AVAILABLE_IN_ALL
-GPermission *           g_simple_permission_new                 (gboolean allowed);
-
-G_END_DECLS
-
-#endif /* __G_SIMPLE_PERMISSION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsimpleproxyresolver.h b/linux-x86/include/glib-2.0/gio/gsimpleproxyresolver.h
deleted file mode 100644
index a451f99..0000000
--- a/linux-x86/include/glib-2.0/gio/gsimpleproxyresolver.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright 2010, 2013 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SIMPLE_PROXY_RESOLVER_H__
-#define __G_SIMPLE_PROXY_RESOLVER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gproxyresolver.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_PROXY_RESOLVER         (g_simple_proxy_resolver_get_type ())
-#define G_SIMPLE_PROXY_RESOLVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SIMPLE_PROXY_RESOLVER, GSimpleProxyResolver))
-#define G_SIMPLE_PROXY_RESOLVER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SIMPLE_PROXY_RESOLVER, GSimpleProxyResolverClass))
-#define G_IS_SIMPLE_PROXY_RESOLVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SIMPLE_PROXY_RESOLVER))
-#define G_IS_SIMPLE_PROXY_RESOLVER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SIMPLE_PROXY_RESOLVER))
-#define G_SIMPLE_PROXY_RESOLVER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SIMPLE_PROXY_RESOLVER, GSimpleProxyResolverClass))
-
-/**
- * GSimpleProxyResolver:
- *
- * A #GProxyResolver implementation for using a fixed set of proxies.
- **/
-typedef struct _GSimpleProxyResolver GSimpleProxyResolver;
-typedef struct _GSimpleProxyResolverPrivate GSimpleProxyResolverPrivate;
-typedef struct _GSimpleProxyResolverClass GSimpleProxyResolverClass;
-
-struct _GSimpleProxyResolver
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GSimpleProxyResolverPrivate *priv;
-};
-
-struct _GSimpleProxyResolverClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GLIB_AVAILABLE_IN_2_36
-GType           g_simple_proxy_resolver_get_type          (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_36
-GProxyResolver *g_simple_proxy_resolver_new               (const gchar           *default_proxy,
-                                                           gchar                **ignore_hosts);
-
-GLIB_AVAILABLE_IN_2_36
-void            g_simple_proxy_resolver_set_default_proxy (GSimpleProxyResolver  *resolver,
-                                                           const gchar           *default_proxy);
-
-GLIB_AVAILABLE_IN_2_36
-void            g_simple_proxy_resolver_set_ignore_hosts  (GSimpleProxyResolver  *resolver,
-                                                           gchar                **ignore_hosts);
-
-GLIB_AVAILABLE_IN_2_36
-void            g_simple_proxy_resolver_set_uri_proxy     (GSimpleProxyResolver  *resolver,
-                                                           const gchar           *uri_scheme,
-                                                           const gchar           *proxy);
-
-G_END_DECLS
-
-#endif /* __G_SIMPLE_PROXY_RESOLVER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsocket.h b/linux-x86/include/glib-2.0/gio/gsocket.h
deleted file mode 100644
index edc0292..0000000
--- a/linux-x86/include/glib-2.0/gio/gsocket.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
- * Copyright © 2009 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- *          Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_SOCKET_H__
-#define __G_SOCKET_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET                                       (g_socket_get_type ())
-#define G_SOCKET(inst)                                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET, GSocket))
-#define G_SOCKET_CLASS(class)                               (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET, GSocketClass))
-#define G_IS_SOCKET(inst)                                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET))
-#define G_IS_SOCKET_CLASS(class)                            (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET))
-#define G_SOCKET_GET_CLASS(inst)                            (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET, GSocketClass))
-
-typedef struct _GSocketPrivate                              GSocketPrivate;
-typedef struct _GSocketClass                                GSocketClass;
-
-struct _GSocketClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-  void (*_g_reserved9) (void);
-  void (*_g_reserved10) (void);
-};
-
-struct _GSocket
-{
-  GObject parent_instance;
-  GSocketPrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                  g_socket_get_type                (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GSocket *              g_socket_new                     (GSocketFamily            family,
-							 GSocketType              type,
-							 GSocketProtocol          protocol,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-GSocket *              g_socket_new_from_fd             (gint                     fd,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-int                    g_socket_get_fd                  (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-GSocketFamily          g_socket_get_family              (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-GSocketType            g_socket_get_socket_type         (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-GSocketProtocol        g_socket_get_protocol            (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress *       g_socket_get_local_address       (GSocket                 *socket,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress *       g_socket_get_remote_address      (GSocket                 *socket,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-void                   g_socket_set_blocking            (GSocket                 *socket,
-							 gboolean                 blocking);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_get_blocking            (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-void                   g_socket_set_keepalive           (GSocket                 *socket,
-							 gboolean                 keepalive);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_get_keepalive           (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-gint                   g_socket_get_listen_backlog      (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-void                   g_socket_set_listen_backlog      (GSocket                 *socket,
-							 gint                     backlog);
-GLIB_AVAILABLE_IN_ALL
-guint                  g_socket_get_timeout             (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-void                   g_socket_set_timeout             (GSocket                 *socket,
-							 guint                    timeout);
-
-GLIB_AVAILABLE_IN_2_32
-guint                  g_socket_get_ttl                 (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_ttl                 (GSocket                 *socket,
-                                                         guint                    ttl);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_get_broadcast           (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_broadcast           (GSocket                 *socket,
-                                                         gboolean		  broadcast);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_get_multicast_loopback  (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_multicast_loopback  (GSocket                 *socket,
-                                                         gboolean		  loopback);
-GLIB_AVAILABLE_IN_2_32
-guint                  g_socket_get_multicast_ttl       (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_multicast_ttl       (GSocket                 *socket,
-                                                         guint                    ttl);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_is_connected            (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_bind                    (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 gboolean                 allow_reuse,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_join_multicast_group    (GSocket                 *socket,
-                                                         GInetAddress            *group,
-                                                         gboolean                 source_specific,
-                                                         const gchar             *iface,
-                                                         GError                 **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_leave_multicast_group   (GSocket                 *socket,
-                                                         GInetAddress            *group,
-                                                         gboolean                 source_specific,
-                                                         const gchar             *iface,
-                                                         GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_connect                 (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_check_connect_result    (GSocket                 *socket,
-							 GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-gssize                 g_socket_get_available_bytes     (GSocket                 *socket);
-
-GLIB_AVAILABLE_IN_ALL
-GIOCondition           g_socket_condition_check         (GSocket                 *socket,
-							 GIOCondition             condition);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_condition_wait          (GSocket                 *socket,
-							 GIOCondition             condition,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_condition_timed_wait    (GSocket                 *socket,
-							 GIOCondition             condition,
-							 gint64                   timeout,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-GSocket *              g_socket_accept                  (GSocket                 *socket,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_listen                  (GSocket                 *socket,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gssize                 g_socket_receive                 (GSocket                 *socket,
-							 gchar                   *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gssize                 g_socket_receive_from            (GSocket                 *socket,
-							 GSocketAddress         **address,
-							 gchar                   *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gssize                 g_socket_send                    (GSocket                 *socket,
-							 const gchar             *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gssize                 g_socket_send_to                 (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 const gchar             *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gssize                 g_socket_receive_message         (GSocket                 *socket,
-							 GSocketAddress         **address,
-							 GInputVector            *vectors,
-							 gint                     num_vectors,
-							 GSocketControlMessage ***messages,
-							 gint                    *num_messages,
-							 gint                    *flags,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gssize                 g_socket_send_message            (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 GOutputVector           *vectors,
-							 gint                     num_vectors,
-							 GSocketControlMessage  **messages,
-							 gint                     num_messages,
-							 gint                     flags,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_close                   (GSocket                 *socket,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_shutdown                (GSocket                 *socket,
-							 gboolean                 shutdown_read,
-							 gboolean                 shutdown_write,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_is_closed               (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-GSource *              g_socket_create_source           (GSocket                 *socket,
-							 GIOCondition             condition,
-							 GCancellable            *cancellable);
-GLIB_AVAILABLE_IN_ALL
-gboolean               g_socket_speaks_ipv4             (GSocket                 *socket);
-GLIB_AVAILABLE_IN_ALL
-GCredentials          *g_socket_get_credentials         (GSocket                 *socket,
-                                                         GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-gssize                 g_socket_receive_with_blocking   (GSocket                 *socket,
-							 gchar                   *buffer,
-							 gsize                    size,
-							 gboolean                 blocking,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_ALL
-gssize                 g_socket_send_with_blocking      (GSocket                 *socket,
-							 const gchar             *buffer,
-							 gsize                    size,
-							 gboolean                 blocking,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-
-GLIB_AVAILABLE_IN_2_36
-gboolean               g_socket_get_option              (GSocket                 *socket,
-							 gint                     level,
-							 gint                     optname,
-							 gint                    *value,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_2_36
-gboolean               g_socket_set_option              (GSocket                 *socket,
-							 gint                     level,
-							 gint                     optname,
-							 gint                     value,
-							 GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsocketaddress.h b/linux-x86/include/glib-2.0/gio/gsocketaddress.h
deleted file mode 100644
index dce3139..0000000
--- a/linux-x86/include/glib-2.0/gio/gsocketaddress.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- */
-
-#ifndef __G_SOCKET_ADDRESS_H__
-#define __G_SOCKET_ADDRESS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_ADDRESS         (g_socket_address_get_type ())
-#define G_SOCKET_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SOCKET_ADDRESS, GSocketAddress))
-#define G_SOCKET_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SOCKET_ADDRESS, GSocketAddressClass))
-#define G_IS_SOCKET_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SOCKET_ADDRESS))
-#define G_IS_SOCKET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SOCKET_ADDRESS))
-#define G_SOCKET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SOCKET_ADDRESS, GSocketAddressClass))
-
-typedef struct _GSocketAddressClass   GSocketAddressClass;
-
-struct _GSocketAddress
-{
-  GObject parent_instance;
-};
-
-struct _GSocketAddressClass
-{
-  GObjectClass parent_class;
-
-  GSocketFamily  (*get_family)      (GSocketAddress *address);
-
-  gssize         (*get_native_size) (GSocketAddress *address);
-
-  gboolean       (*to_native)       (GSocketAddress *address,
-                                     gpointer        dest,
-                                     gsize           destlen,
-				     GError        **error);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                 g_socket_address_get_type        (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketFamily         g_socket_address_get_family      (GSocketAddress *address);
-
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress *      g_socket_address_new_from_native (gpointer        native,
-                                                        gsize           len);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_socket_address_to_native       (GSocketAddress *address,
-                                                        gpointer        dest,
-                                                        gsize           destlen,
-							GError        **error);
-
-GLIB_AVAILABLE_IN_ALL
-gssize                g_socket_address_get_native_size (GSocketAddress *address);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_ADDRESS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsocketaddressenumerator.h b/linux-x86/include/glib-2.0/gio/gsocketaddressenumerator.h
deleted file mode 100644
index bf415d1..0000000
--- a/linux-x86/include/glib-2.0/gio/gsocketaddressenumerator.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SOCKET_ADDRESS_ENUMERATOR_H__
-#define __G_SOCKET_ADDRESS_ENUMERATOR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_ADDRESS_ENUMERATOR         (g_socket_address_enumerator_get_type ())
-#define G_SOCKET_ADDRESS_ENUMERATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SOCKET_ADDRESS_ENUMERATOR, GSocketAddressEnumerator))
-#define G_SOCKET_ADDRESS_ENUMERATOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SOCKET_ADDRESS_ENUMERATOR, GSocketAddressEnumeratorClass))
-#define G_IS_SOCKET_ADDRESS_ENUMERATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SOCKET_ADDRESS_ENUMERATOR))
-#define G_IS_SOCKET_ADDRESS_ENUMERATOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SOCKET_ADDRESS_ENUMERATOR))
-#define G_SOCKET_ADDRESS_ENUMERATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SOCKET_ADDRESS_ENUMERATOR, GSocketAddressEnumeratorClass))
-
-/**
- * GSocketAddressEnumerator:
- *
- * Enumerator type for objects that contain or generate
- * #GSocketAddress<!-- -->es.
- */
-typedef struct _GSocketAddressEnumeratorClass GSocketAddressEnumeratorClass;
-
-struct _GSocketAddressEnumerator
-{
-  GObject parent_instance;
-
-};
-
-struct _GSocketAddressEnumeratorClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Table */
-
-  GSocketAddress * (* next)        (GSocketAddressEnumerator  *enumerator,
-				    GCancellable              *cancellable,
-				    GError                   **error);
-
-  void             (* next_async)  (GSocketAddressEnumerator  *enumerator,
-				    GCancellable              *cancellable,
-				    GAsyncReadyCallback        callback,
-				    gpointer                   user_data);
-  GSocketAddress * (* next_finish) (GSocketAddressEnumerator  *enumerator,
-				    GAsyncResult              *result,
-				    GError                   **error);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType           g_socket_address_enumerator_get_type        (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress *g_socket_address_enumerator_next        (GSocketAddressEnumerator  *enumerator,
-							 GCancellable              *cancellable,
-							 GError                   **error);
-
-GLIB_AVAILABLE_IN_ALL
-void            g_socket_address_enumerator_next_async  (GSocketAddressEnumerator  *enumerator,
-							 GCancellable              *cancellable,
-							 GAsyncReadyCallback        callback,
-							 gpointer                   user_data);
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress *g_socket_address_enumerator_next_finish (GSocketAddressEnumerator  *enumerator,
-							 GAsyncResult              *result,
-							 GError                   **error);
-
-G_END_DECLS
-
-
-#endif /* __G_SOCKET_ADDRESS_ENUMERATOR_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsocketclient.h b/linux-x86/include/glib-2.0/gio/gsocketclient.h
deleted file mode 100644
index 72bace7..0000000
--- a/linux-x86/include/glib-2.0/gio/gsocketclient.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008, 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_SOCKET_CLIENT_H__
-#define __G_SOCKET_CLIENT_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CLIENT                                (g_socket_client_get_type ())
-#define G_SOCKET_CLIENT(inst)                               (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_CLIENT, GSocketClient))
-#define G_SOCKET_CLIENT_CLASS(class)                        (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_CLIENT, GSocketClientClass))
-#define G_IS_SOCKET_CLIENT(inst)                            (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_CLIENT))
-#define G_IS_SOCKET_CLIENT_CLASS(class)                     (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_CLIENT))
-#define G_SOCKET_CLIENT_GET_CLASS(inst)                     (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_CLIENT, GSocketClientClass))
-
-typedef struct _GSocketClientPrivate                        GSocketClientPrivate;
-typedef struct _GSocketClientClass                          GSocketClientClass;
-
-struct _GSocketClientClass
-{
-  GObjectClass parent_class;
-
-  void (* event) (GSocketClient       *client,
-		  GSocketClientEvent  event,
-		  GSocketConnectable  *connectable,
-		  GIOStream           *connection);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-};
-
-struct _GSocketClient
-{
-  GObject parent_instance;
-  GSocketClientPrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_socket_client_get_type                        (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketClient          *g_socket_client_new                             (void);
-
-GLIB_AVAILABLE_IN_ALL
-GSocketFamily           g_socket_client_get_family                      (GSocketClient        *client);
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_client_set_family                      (GSocketClient        *client,
-									 GSocketFamily         family);
-GLIB_AVAILABLE_IN_ALL
-GSocketType             g_socket_client_get_socket_type                 (GSocketClient        *client);
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_client_set_socket_type                 (GSocketClient        *client,
-									 GSocketType           type);
-GLIB_AVAILABLE_IN_ALL
-GSocketProtocol         g_socket_client_get_protocol                    (GSocketClient        *client);
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_client_set_protocol                    (GSocketClient        *client,
-									 GSocketProtocol       protocol);
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress         *g_socket_client_get_local_address               (GSocketClient        *client);
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_client_set_local_address               (GSocketClient        *client,
-									 GSocketAddress       *address);
-GLIB_AVAILABLE_IN_ALL
-guint                   g_socket_client_get_timeout                     (GSocketClient        *client);
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_client_set_timeout                     (GSocketClient        *client,
-									 guint                 timeout);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_socket_client_get_enable_proxy                (GSocketClient        *client);
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_client_set_enable_proxy                (GSocketClient        *client,
-    									 gboolean	      enable);
-
-GLIB_AVAILABLE_IN_2_28
-gboolean                g_socket_client_get_tls                         (GSocketClient        *client);
-GLIB_AVAILABLE_IN_2_28
-void                    g_socket_client_set_tls                         (GSocketClient        *client,
-									 gboolean              tls);
-GLIB_AVAILABLE_IN_2_28
-GTlsCertificateFlags    g_socket_client_get_tls_validation_flags        (GSocketClient        *client);
-GLIB_AVAILABLE_IN_2_28
-void                    g_socket_client_set_tls_validation_flags        (GSocketClient        *client,
-									 GTlsCertificateFlags  flags);
-GLIB_AVAILABLE_IN_2_36
-GProxyResolver         *g_socket_client_get_proxy_resolver              (GSocketClient        *client);
-GLIB_AVAILABLE_IN_2_36
-void                    g_socket_client_set_proxy_resolver              (GSocketClient        *client,
-                                                                         GProxyResolver       *proxy_resolver);
-
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *     g_socket_client_connect                         (GSocketClient        *client,
-                                                                         GSocketConnectable   *connectable,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *     g_socket_client_connect_to_host                 (GSocketClient        *client,
-									 const gchar          *host_and_port,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *     g_socket_client_connect_to_service              (GSocketClient        *client,
-									 const gchar          *domain,
-									 const gchar          *service,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_2_26
-GSocketConnection *     g_socket_client_connect_to_uri                  (GSocketClient        *client,
-									 const gchar          *uri,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_client_connect_async                   (GSocketClient        *client,
-                                                                         GSocketConnectable   *connectable,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *     g_socket_client_connect_finish                  (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_client_connect_to_host_async           (GSocketClient        *client,
-									 const gchar          *host_and_port,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *     g_socket_client_connect_to_host_finish          (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_client_connect_to_service_async        (GSocketClient        *client,
-									 const gchar          *domain,
-									 const gchar          *service,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *     g_socket_client_connect_to_service_finish       (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_client_connect_to_uri_async            (GSocketClient        *client,
-									 const gchar          *uri,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *     g_socket_client_connect_to_uri_finish           (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void			g_socket_client_add_application_proxy		(GSocketClient        *client,
-									 const gchar          *protocol);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_CLIENT_H___ */
diff --git a/linux-x86/include/glib-2.0/gio/gsocketconnectable.h b/linux-x86/include/glib-2.0/gio/gsocketconnectable.h
deleted file mode 100644
index 5a80ea8..0000000
--- a/linux-x86/include/glib-2.0/gio/gsocketconnectable.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SOCKET_CONNECTABLE_H__
-#define __G_SOCKET_CONNECTABLE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CONNECTABLE            (g_socket_connectable_get_type ())
-#define G_SOCKET_CONNECTABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_SOCKET_CONNECTABLE, GSocketConnectable))
-#define G_IS_SOCKET_CONNECTABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_SOCKET_CONNECTABLE))
-#define G_SOCKET_CONNECTABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_SOCKET_CONNECTABLE, GSocketConnectableIface))
-
-/**
- * GSocketConnectable:
- *
- * Interface for objects that contain or generate #GSocketAddress<!-- -->es.
- */
-typedef struct _GSocketConnectableIface GSocketConnectableIface;
-
-/**
- * GSocketConnectableIface:
- * @g_iface: The parent interface.
- * @enumerate: Creates a #GSocketAddressEnumerator
- * @proxy_enumerate: Creates a #GProxyAddressEnumerator
- *
- * Provides an interface for returning a #GSocketAddressEnumerator
- * and #GProxyAddressEnumerator
- */
-struct _GSocketConnectableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GSocketAddressEnumerator * (* enumerate)       (GSocketConnectable *connectable);
-
-  GSocketAddressEnumerator * (* proxy_enumerate) (GSocketConnectable *connectable);
-
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                     g_socket_connectable_get_type  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketAddressEnumerator *g_socket_connectable_enumerate (GSocketConnectable *connectable);
-
-GLIB_AVAILABLE_IN_ALL
-GSocketAddressEnumerator *g_socket_connectable_proxy_enumerate (GSocketConnectable *connectable);
-
-G_END_DECLS
-
-
-#endif /* __G_SOCKET_CONNECTABLE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsocketconnection.h b/linux-x86/include/glib-2.0/gio/gsocketconnection.h
deleted file mode 100644
index b93201f..0000000
--- a/linux-x86/include/glib-2.0/gio/gsocketconnection.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
- * Copyright © 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- *          Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_SOCKET_CONNECTION_H__
-#define __G_SOCKET_CONNECTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <glib-object.h>
-#include <gio/gsocket.h>
-#include <gio/giostream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CONNECTION                            (g_socket_connection_get_type ())
-#define G_SOCKET_CONNECTION(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_CONNECTION, GSocketConnection))
-#define G_SOCKET_CONNECTION_CLASS(class)                    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_CONNECTION, GSocketConnectionClass))
-#define G_IS_SOCKET_CONNECTION(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_CONNECTION))
-#define G_IS_SOCKET_CONNECTION_CLASS(class)                 (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_CONNECTION))
-#define G_SOCKET_CONNECTION_GET_CLASS(inst)                 (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_CONNECTION, GSocketConnectionClass))
-
-typedef struct _GSocketConnectionPrivate                    GSocketConnectionPrivate;
-typedef struct _GSocketConnectionClass                      GSocketConnectionClass;
-
-struct _GSocketConnectionClass
-{
-  GIOStreamClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-struct _GSocketConnection
-{
-  GIOStream parent_instance;
-  GSocketConnectionPrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType              g_socket_connection_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-gboolean           g_socket_connection_is_connected              (GSocketConnection  *connection);
-GLIB_AVAILABLE_IN_2_32
-gboolean           g_socket_connection_connect                   (GSocketConnection  *connection,
-								  GSocketAddress     *address,
-								  GCancellable       *cancellable,
-								  GError            **error);
-GLIB_AVAILABLE_IN_2_32
-void               g_socket_connection_connect_async             (GSocketConnection  *connection,
-								  GSocketAddress     *address,
-								  GCancellable       *cancellable,
-								  GAsyncReadyCallback callback,
-								  gpointer            user_data);
-GLIB_AVAILABLE_IN_2_32
-gboolean           g_socket_connection_connect_finish            (GSocketConnection  *connection,
-								  GAsyncResult       *result,
-								  GError            **error);
-
-GLIB_AVAILABLE_IN_ALL
-GSocket           *g_socket_connection_get_socket                (GSocketConnection  *connection);
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress    *g_socket_connection_get_local_address         (GSocketConnection  *connection,
-								  GError            **error);
-GLIB_AVAILABLE_IN_ALL
-GSocketAddress    *g_socket_connection_get_remote_address        (GSocketConnection  *connection,
-								  GError            **error);
-
-GLIB_AVAILABLE_IN_ALL
-void               g_socket_connection_factory_register_type     (GType               g_type,
-								  GSocketFamily       family,
-								  GSocketType         type,
-								  gint                protocol);
-GLIB_AVAILABLE_IN_ALL
-GType              g_socket_connection_factory_lookup_type       (GSocketFamily       family,
-								  GSocketType         type,
-								  gint                protocol_id);
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *g_socket_connection_factory_create_connection (GSocket            *socket);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_CONNECTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsocketcontrolmessage.h b/linux-x86/include/glib-2.0/gio/gsocketcontrolmessage.h
deleted file mode 100644
index aaa7c93..0000000
--- a/linux-x86/include/glib-2.0/gio/gsocketcontrolmessage.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_SOCKET_CONTROL_MESSAGE_H__
-#define __G_SOCKET_CONTROL_MESSAGE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CONTROL_MESSAGE                       (g_socket_control_message_get_type ())
-#define G_SOCKET_CONTROL_MESSAGE(inst)                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE,                          \
-                                                             GSocketControlMessage))
-#define G_SOCKET_CONTROL_MESSAGE_CLASS(class)               (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE,                          \
-                                                             GSocketControlMessageClass))
-#define G_IS_SOCKET_CONTROL_MESSAGE(inst)                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE))
-#define G_IS_SOCKET_CONTROL_MESSAGE_CLASS(class)            (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE))
-#define G_SOCKET_CONTROL_MESSAGE_GET_CLASS(inst)            (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE,                          \
-                                                             GSocketControlMessageClass))
-
-typedef struct _GSocketControlMessagePrivate                GSocketControlMessagePrivate;
-typedef struct _GSocketControlMessageClass                  GSocketControlMessageClass;
-
-/**
- * GSocketControlMessageClass:
- * @get_size: gets the size of the message.
- * @get_level: gets the protocol of the message.
- * @get_type: gets the protocol specific type of the message.
- * @serialize: Writes out the message data.
- * @deserialize: Tries to deserialize a message.
- **/
-
-struct _GSocketControlMessageClass
-{
-  GObjectClass parent_class;
-
-  gsize                  (* get_size)  (GSocketControlMessage  *message);
-  int                    (* get_level) (GSocketControlMessage  *message);
-  int                    (* get_type)  (GSocketControlMessage  *message);
-  void                   (* serialize) (GSocketControlMessage  *message,
-					gpointer                data);
-  GSocketControlMessage *(* deserialize) (int                   level,
-					  int                   type,
-					  gsize                 size,
-					  gpointer              data);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-struct _GSocketControlMessage
-{
-  GObject parent_instance;
-  GSocketControlMessagePrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                  g_socket_control_message_get_type     (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gsize                  g_socket_control_message_get_size     (GSocketControlMessage *message);
-GLIB_AVAILABLE_IN_ALL
-int                    g_socket_control_message_get_level    (GSocketControlMessage *message);
-GLIB_AVAILABLE_IN_ALL
-int                    g_socket_control_message_get_msg_type (GSocketControlMessage *message);
-GLIB_AVAILABLE_IN_ALL
-void                   g_socket_control_message_serialize    (GSocketControlMessage *message,
-							      gpointer               data);
-GLIB_AVAILABLE_IN_ALL
-GSocketControlMessage *g_socket_control_message_deserialize  (int                    level,
-							      int                    type,
-							      gsize                  size,
-							      gpointer               data);
-
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_CONTROL_MESSAGE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsocketlistener.h b/linux-x86/include/glib-2.0/gio/gsocketlistener.h
deleted file mode 100644
index 09f3985..0000000
--- a/linux-x86/include/glib-2.0/gio/gsocketlistener.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
- * Copyright © 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- *          Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_SOCKET_LISTENER_H__
-#define __G_SOCKET_LISTENER_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_LISTENER                              (g_socket_listener_get_type ())
-#define G_SOCKET_LISTENER(inst)                             (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_LISTENER, GSocketListener))
-#define G_SOCKET_LISTENER_CLASS(class)                      (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_LISTENER, GSocketListenerClass))
-#define G_IS_SOCKET_LISTENER(inst)                          (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_LISTENER))
-#define G_IS_SOCKET_LISTENER_CLASS(class)                   (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_LISTENER))
-#define G_SOCKET_LISTENER_GET_CLASS(inst)                   (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_LISTENER, GSocketListenerClass))
-
-typedef struct _GSocketListenerPrivate                      GSocketListenerPrivate;
-typedef struct _GSocketListenerClass                        GSocketListenerClass;
-
-/**
- * GSocketListenerClass:
- * @changed: virtual method called when the set of socket listened to changes
- **/
-struct _GSocketListenerClass
-{
-  GObjectClass parent_class;
-
-  void (* changed) (GSocketListener *listener);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-struct _GSocketListener
-{
-  GObject parent_instance;
-  GSocketListenerPrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_socket_listener_get_type                      (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketListener *       g_socket_listener_new                           (void);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_listener_set_backlog                   (GSocketListener     *listener,
-									 int                  listen_backlog);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_socket_listener_add_socket                    (GSocketListener     *listener,
-                                                                         GSocket             *socket,
-									 GObject             *source_object,
-									 GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_socket_listener_add_address                   (GSocketListener     *listener,
-                                                                         GSocketAddress      *address,
-									 GSocketType          type,
-									 GSocketProtocol      protocol,
-									 GObject             *source_object,
-                                                                         GSocketAddress     **effective_address,
-									 GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_socket_listener_add_inet_port                 (GSocketListener     *listener,
-                                                                         guint16              port,
-									 GObject             *source_object,
-									 GError             **error);
-GLIB_AVAILABLE_IN_ALL
-guint16                 g_socket_listener_add_any_inet_port             (GSocketListener     *listener,
-									 GObject             *source_object,
-									 GError             **error);
-
-GLIB_AVAILABLE_IN_ALL
-GSocket *               g_socket_listener_accept_socket                 (GSocketListener      *listener,
-									 GObject             **source_object,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_listener_accept_socket_async           (GSocketListener      *listener,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-GSocket *               g_socket_listener_accept_socket_finish          (GSocketListener      *listener,
-                                                                         GAsyncResult         *result,
-									 GObject             **source_object,
-                                                                         GError              **error);
-
-
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *     g_socket_listener_accept                        (GSocketListener      *listener,
-									 GObject             **source_object,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_listener_accept_async                  (GSocketListener      *listener,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *     g_socket_listener_accept_finish                 (GSocketListener      *listener,
-                                                                         GAsyncResult         *result,
-									 GObject             **source_object,
-                                                                         GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_socket_listener_close                         (GSocketListener      *listener);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_LISTENER_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsocketservice.h b/linux-x86/include/glib-2.0/gio/gsocketservice.h
deleted file mode 100644
index d10b566..0000000
--- a/linux-x86/include/glib-2.0/gio/gsocketservice.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_SOCKET_SERVICE_H__
-#define __G_SOCKET_SERVICE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gsocketlistener.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_SERVICE                               (g_socket_service_get_type ())
-#define G_SOCKET_SERVICE(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_SERVICE, GSocketService))
-#define G_SOCKET_SERVICE_CLASS(class)                       (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_SERVICE, GSocketServiceClass))
-#define G_IS_SOCKET_SERVICE(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_SERVICE))
-#define G_IS_SOCKET_SERVICE_CLASS(class)                    (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_SERVICE))
-#define G_SOCKET_SERVICE_GET_CLASS(inst)                    (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_SERVICE, GSocketServiceClass))
-
-typedef struct _GSocketServicePrivate                       GSocketServicePrivate;
-typedef struct _GSocketServiceClass                         GSocketServiceClass;
-
-/**
- * GSocketServiceClass:
- * @incomming: signal emitted when new connections are accepted
- */
-struct _GSocketServiceClass
-{
-  GSocketListenerClass parent_class;
-
-  gboolean (* incoming) (GSocketService    *service,
-                         GSocketConnection *connection,
-			 GObject           *source_object);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-struct _GSocketService
-{
-  GSocketListener parent_instance;
-  GSocketServicePrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType           g_socket_service_get_type  (void);
-
-GLIB_AVAILABLE_IN_ALL
-GSocketService *g_socket_service_new       (void);
-GLIB_AVAILABLE_IN_ALL
-void            g_socket_service_start     (GSocketService *service);
-GLIB_AVAILABLE_IN_ALL
-void            g_socket_service_stop      (GSocketService *service);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_socket_service_is_active (GSocketService *service);
-
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_SERVICE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gsrvtarget.h b/linux-x86/include/glib-2.0/gio/gsrvtarget.h
deleted file mode 100644
index 6135ef2..0000000
--- a/linux-x86/include/glib-2.0/gio/gsrvtarget.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SRV_TARGET_H__
-#define __G_SRV_TARGET_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-GType g_srv_target_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SRV_TARGET (g_srv_target_get_type ())
-
-GLIB_AVAILABLE_IN_ALL
-GSrvTarget  *g_srv_target_new          (const gchar *hostname,
-				        guint16      port,
-				        guint16      priority,
-				        guint16      weight);
-GLIB_AVAILABLE_IN_ALL
-GSrvTarget  *g_srv_target_copy         (GSrvTarget  *target);
-GLIB_AVAILABLE_IN_ALL
-void         g_srv_target_free         (GSrvTarget  *target);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_srv_target_get_hostname (GSrvTarget  *target);
-GLIB_AVAILABLE_IN_ALL
-guint16      g_srv_target_get_port     (GSrvTarget  *target);
-GLIB_AVAILABLE_IN_ALL
-guint16      g_srv_target_get_priority (GSrvTarget  *target);
-GLIB_AVAILABLE_IN_ALL
-guint16      g_srv_target_get_weight   (GSrvTarget  *target);
-
-GLIB_AVAILABLE_IN_ALL
-GList       *g_srv_target_list_sort    (GList       *targets);
-
-G_END_DECLS
-
-#endif /* __G_SRV_TARGET_H__ */
-
diff --git a/linux-x86/include/glib-2.0/gio/gtask.h b/linux-x86/include/glib-2.0/gio/gtask.h
deleted file mode 100644
index d5a2d77..0000000
--- a/linux-x86/include/glib-2.0/gio/gtask.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_TASK_H__
-#define __G_TASK_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TASK         (g_task_get_type ())
-#define G_TASK(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_TASK, GTask))
-#define G_TASK_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_TASK, GTaskClass))
-#define G_IS_TASK(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_TASK))
-#define G_IS_TASK_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_TASK))
-#define G_TASK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_TASK, GTaskClass))
-
-typedef struct _GTaskClass   GTaskClass;
-
-GLIB_AVAILABLE_IN_2_36
-GType         g_task_get_type              (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_36
-GTask        *g_task_new                   (gpointer             source_object,
-                                            GCancellable        *cancellable,
-                                            GAsyncReadyCallback  callback,
-                                            gpointer             callback_data);
-
-GLIB_AVAILABLE_IN_2_36
-void          g_task_report_error          (gpointer             source_object,
-                                            GAsyncReadyCallback  callback,
-                                            gpointer             callback_data,
-                                            gpointer             source_tag,
-                                            GError              *error);
-GLIB_AVAILABLE_IN_2_36
-void          g_task_report_new_error      (gpointer             source_object,
-                                            GAsyncReadyCallback  callback,
-                                            gpointer             callback_data,
-                                            gpointer             source_tag,
-                                            GQuark               domain,
-                                            gint                 code,
-                                            const char          *format,
-                                            ...) G_GNUC_PRINTF(7, 8);
-
-GLIB_AVAILABLE_IN_2_36
-void          g_task_set_task_data         (GTask               *task,
-                                            gpointer             task_data,
-                                            GDestroyNotify       task_data_destroy);
-GLIB_AVAILABLE_IN_2_36
-void          g_task_set_priority          (GTask               *task,
-                                            gint                 priority);
-GLIB_AVAILABLE_IN_2_36
-void          g_task_set_check_cancellable (GTask               *task,
-                                            gboolean             check_cancellable);
-GLIB_AVAILABLE_IN_2_36
-void          g_task_set_source_tag        (GTask               *task,
-                                            gpointer             source_tag);
-
-GLIB_AVAILABLE_IN_2_36
-gpointer      g_task_get_source_object     (GTask               *task);
-GLIB_AVAILABLE_IN_2_36
-gpointer      g_task_get_task_data         (GTask               *task);
-GLIB_AVAILABLE_IN_2_36
-gint          g_task_get_priority          (GTask               *task);
-GLIB_AVAILABLE_IN_2_36
-GMainContext *g_task_get_context           (GTask               *task);
-GLIB_AVAILABLE_IN_2_36
-GCancellable *g_task_get_cancellable       (GTask               *task);
-GLIB_AVAILABLE_IN_2_36
-gboolean      g_task_get_check_cancellable (GTask               *task);
-GLIB_AVAILABLE_IN_2_36
-gpointer      g_task_get_source_tag        (GTask               *task);
-
-GLIB_AVAILABLE_IN_2_36
-gboolean      g_task_is_valid              (gpointer             result,
-                                            gpointer             source_object);
-
-
-typedef void (*GTaskThreadFunc)           (GTask           *task,
-                                           gpointer         source_object,
-                                           gpointer         task_data,
-                                           GCancellable    *cancellable);
-GLIB_AVAILABLE_IN_2_36
-void          g_task_run_in_thread        (GTask           *task,
-                                           GTaskThreadFunc  task_func);
-GLIB_AVAILABLE_IN_2_36
-void          g_task_run_in_thread_sync   (GTask           *task,
-                                           GTaskThreadFunc  task_func);
-GLIB_AVAILABLE_IN_2_36
-gboolean      g_task_set_return_on_cancel (GTask           *task,
-                                           gboolean         return_on_cancel);
-GLIB_AVAILABLE_IN_2_36
-gboolean      g_task_get_return_on_cancel (GTask           *task);
-
-GLIB_AVAILABLE_IN_2_36
-void          g_task_attach_source        (GTask           *task,
-                                           GSource         *source,
-                                           GSourceFunc      callback);
-
-
-GLIB_AVAILABLE_IN_2_36
-void          g_task_return_pointer            (GTask           *task,
-                                                gpointer         result,
-                                                GDestroyNotify   result_destroy);
-GLIB_AVAILABLE_IN_2_36
-void          g_task_return_boolean            (GTask           *task,
-                                                gboolean         result);
-GLIB_AVAILABLE_IN_2_36
-void          g_task_return_int                (GTask           *task,
-                                                gssize           result);
-
-GLIB_AVAILABLE_IN_2_36
-void          g_task_return_error              (GTask           *task,
-                                                GError          *error);
-GLIB_AVAILABLE_IN_2_36
-void          g_task_return_new_error          (GTask           *task,
-                                                GQuark           domain,
-                                                gint             code,
-                                                const char      *format,
-                                                ...) G_GNUC_PRINTF (4, 5);
-
-GLIB_AVAILABLE_IN_2_36
-gboolean      g_task_return_error_if_cancelled (GTask           *task);
-
-GLIB_AVAILABLE_IN_2_36
-gpointer      g_task_propagate_pointer         (GTask           *task,
-                                                GError         **error);
-GLIB_AVAILABLE_IN_2_36
-gboolean      g_task_propagate_boolean         (GTask           *task,
-                                                GError         **error);
-GLIB_AVAILABLE_IN_2_36
-gssize        g_task_propagate_int             (GTask           *task,
-                                                GError         **error);
-GLIB_AVAILABLE_IN_2_36
-gboolean      g_task_had_error                 (GTask           *task);
-
-G_END_DECLS
-
-#endif /* __G_TASK_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtcpconnection.h b/linux-x86/include/glib-2.0/gio/gtcpconnection.h
deleted file mode 100644
index 3d02f3a..0000000
--- a/linux-x86/include/glib-2.0/gio/gtcpconnection.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008, 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_TCP_CONNECTION_H__
-#define __G_TCP_CONNECTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gsocketconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TCP_CONNECTION                               (g_tcp_connection_get_type ())
-#define G_TCP_CONNECTION(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_TCP_CONNECTION, GTcpConnection))
-#define G_TCP_CONNECTION_CLASS(class)                       (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_TCP_CONNECTION, GTcpConnectionClass))
-#define G_IS_TCP_CONNECTION(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_TCP_CONNECTION))
-#define G_IS_TCP_CONNECTION_CLASS(class)                    (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_TCP_CONNECTION))
-#define G_TCP_CONNECTION_GET_CLASS(inst)                    (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_TCP_CONNECTION, GTcpConnectionClass))
-
-typedef struct _GTcpConnectionPrivate                       GTcpConnectionPrivate;
-typedef struct _GTcpConnectionClass                         GTcpConnectionClass;
-
-struct _GTcpConnectionClass
-{
-  GSocketConnectionClass parent_class;
-};
-
-struct _GTcpConnection
-{
-  GSocketConnection parent_instance;
-  GTcpConnectionPrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_tcp_connection_get_type                (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-void     g_tcp_connection_set_graceful_disconnect (GTcpConnection *connection,
-						   gboolean        graceful_disconnect);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_tcp_connection_get_graceful_disconnect (GTcpConnection *connection);
-
-G_END_DECLS
-
-#endif /* __G_TCP_CONNECTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtcpwrapperconnection.h b/linux-x86/include/glib-2.0/gio/gtcpwrapperconnection.h
deleted file mode 100644
index 43b1e3e..0000000
--- a/linux-x86/include/glib-2.0/gio/gtcpwrapperconnection.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- * Copyright © 2010 Collabora Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- *
- */
-
-#ifndef __G_TCP_WRAPPER_CONNECTION_H__
-#define __G_TCP_WRAPPER_CONNECTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gtcpconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TCP_WRAPPER_CONNECTION            (g_tcp_wrapper_connection_get_type ())
-#define G_TCP_WRAPPER_CONNECTION(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION, GTcpWrapperConnection))
-#define G_TCP_WRAPPER_CONNECTION_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION, GTcpWrapperConnectionClass))
-#define G_IS_TCP_WRAPPER_CONNECTION(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION))
-#define G_IS_TCP_WRAPPER_CONNECTION_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION))
-#define G_TCP_WRAPPER_CONNECTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION, GTcpWrapperConnectionClass))
-
-typedef struct _GTcpWrapperConnectionPrivate GTcpWrapperConnectionPrivate;
-typedef struct _GTcpWrapperConnectionClass   GTcpWrapperConnectionClass;
-
-struct _GTcpWrapperConnectionClass
-{
-  GTcpConnectionClass parent_class;
-};
-
-struct _GTcpWrapperConnection
-{
-  GTcpConnection parent_instance;
-  GTcpWrapperConnectionPrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType              g_tcp_wrapper_connection_get_type (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GSocketConnection *g_tcp_wrapper_connection_new                (GIOStream             *base_io_stream,
-								GSocket               *socket);
-GLIB_AVAILABLE_IN_ALL
-GIOStream         *g_tcp_wrapper_connection_get_base_io_stream (GTcpWrapperConnection *conn);
-
-G_END_DECLS
-
-#endif /* __G_TCP_WRAPPER_CONNECTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtestdbus.h b/linux-x86/include/glib-2.0/gio/gtestdbus.h
deleted file mode 100644
index 00644d6..0000000
--- a/linux-x86/include/glib-2.0/gio/gtestdbus.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GIO testing utilities
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: David Zeuthen <davidz@redhat.com>
- *          Xavier Claessens <xavier.claessens@collabora.co.uk>
- */
-
-#ifndef __G_TEST_DBUS_H__
-#define __G_TEST_DBUS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TEST_DBUS \
-    (g_test_dbus_get_type ())
-#define G_TEST_DBUS(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_TEST_DBUS, \
-        GTestDBus))
-#define G_IS_TEST_DBUS(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_TEST_DBUS))
-
-GLIB_AVAILABLE_IN_2_34
-GType          g_test_dbus_get_type        (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_34
-GTestDBus *    g_test_dbus_new             (GTestDBusFlags flags);
-
-GLIB_AVAILABLE_IN_2_34
-GTestDBusFlags g_test_dbus_get_flags       (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-const gchar *  g_test_dbus_get_bus_address (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_add_service_dir (GTestDBus     *self,
-                                            const gchar   *path);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_up              (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_stop            (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_down            (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_unset           (void);
-
-G_END_DECLS
-
-#endif /* __G_TEST_DBUS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gthemedicon.h b/linux-x86/include/glib-2.0/gio/gthemedicon.h
deleted file mode 100644
index 4cbd29b..0000000
--- a/linux-x86/include/glib-2.0/gio/gthemedicon.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_THEMED_ICON_H__
-#define __G_THEMED_ICON_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_THEMED_ICON         (g_themed_icon_get_type ())
-#define G_THEMED_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_THEMED_ICON, GThemedIcon))
-#define G_THEMED_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_THEMED_ICON, GThemedIconClass))
-#define G_IS_THEMED_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_THEMED_ICON))
-#define G_IS_THEMED_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_THEMED_ICON))
-#define G_THEMED_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_THEMED_ICON, GThemedIconClass))
-
-/**
- * GThemedIcon:
- *
- * An implementation of #GIcon for themed icons.
- **/
-typedef struct _GThemedIconClass   GThemedIconClass;
-
-GLIB_AVAILABLE_IN_ALL
-GType  g_themed_icon_get_type                   (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GIcon *g_themed_icon_new                        (const char  *iconname);
-GLIB_AVAILABLE_IN_ALL
-GIcon *g_themed_icon_new_with_default_fallbacks (const char  *iconname);
-GLIB_AVAILABLE_IN_ALL
-GIcon *g_themed_icon_new_from_names             (char       **iconnames,
-                                                 int          len);
-GLIB_AVAILABLE_IN_ALL
-void   g_themed_icon_prepend_name               (GThemedIcon *icon,
-                                                 const char  *iconname);
-GLIB_AVAILABLE_IN_ALL
-void   g_themed_icon_append_name                (GThemedIcon *icon,
-                                                 const char  *iconname);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar* const * g_themed_icon_get_names     (GThemedIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_THEMED_ICON_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gthreadedsocketservice.h b/linux-x86/include/glib-2.0/gio/gthreadedsocketservice.h
deleted file mode 100644
index 229be7e..0000000
--- a/linux-x86/include/glib-2.0/gio/gthreadedsocketservice.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_THREADED_SOCKET_SERVICE_H__
-#define __G_THREADED_SOCKET_SERVICE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gsocketservice.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_THREADED_SOCKET_SERVICE                      (g_threaded_socket_service_get_type ())
-#define G_THREADED_SOCKET_SERVICE(inst)                     (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE,                         \
-                                                             GThreadedSocketService))
-#define G_THREADED_SOCKET_SERVICE_CLASS(class)              (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE,                         \
-                                                             GThreadedSocketServiceClass))
-#define G_IS_THREADED_SOCKET_SERVICE(inst)                  (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE))
-#define G_IS_THREADED_SOCKET_SERVICE_CLASS(class)           (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE))
-#define G_THREADED_SOCKET_SERVICE_GET_CLASS(inst)           (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE,                         \
-                                                             GThreadedSocketServiceClass))
-
-typedef struct _GThreadedSocketServicePrivate               GThreadedSocketServicePrivate;
-typedef struct _GThreadedSocketServiceClass                 GThreadedSocketServiceClass;
-
-struct _GThreadedSocketServiceClass
-{
-  GSocketServiceClass parent_class;
-
-  gboolean (* run) (GThreadedSocketService *service,
-                    GSocketConnection      *connection,
-                    GObject                *source_object);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-struct _GThreadedSocketService
-{
-  GSocketService parent_instance;
-  GThreadedSocketServicePrivate *priv;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                   g_threaded_socket_service_get_type              (void);
-GLIB_AVAILABLE_IN_ALL
-GSocketService *        g_threaded_socket_service_new                   (int max_threads);
-
-G_END_DECLS
-
-#endif /* __G_THREADED_SOCKET_SERVICE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtlsbackend.h b/linux-x86/include/glib-2.0/gio/gtlsbackend.h
deleted file mode 100644
index 19f08ad..0000000
--- a/linux-x86/include/glib-2.0/gio/gtlsbackend.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_TLS_BACKEND_H__
-#define __G_TLS_BACKEND_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TLS_BACKEND_EXTENSION_POINT_NAME:
- *
- * Extension point for TLS functionality via #GTlsBackend.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_TLS_BACKEND_EXTENSION_POINT_NAME "gio-tls-backend"
-
-#define G_TYPE_TLS_BACKEND               (g_tls_backend_get_type ())
-#define G_TLS_BACKEND(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_TLS_BACKEND, GTlsBackend))
-#define G_IS_TLS_BACKEND(obj)	         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_TLS_BACKEND))
-#define G_TLS_BACKEND_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_TLS_BACKEND, GTlsBackendInterface))
-
-typedef struct _GTlsBackend          GTlsBackend;
-typedef struct _GTlsBackendInterface GTlsBackendInterface;
-
-/**
- * GTlsBackendInterface:
- * @g_iface: The parent interface.
- * @supports_tls: returns whether the backend supports TLS.
- * @get_default_database: returns a default #GTlsDatabase instance.
- * @get_certificate_type: returns the #GTlsCertificate implementation type
- * @get_client_connection_type: returns the #GTlsClientConnection implementation type
- * @get_server_connection_type: returns the #GTlsServerConnection implementation type
- * @get_file_database_type: returns the #GTlsFileDatabase implementation type.
- *
- * Provides an interface for describing TLS-related types.
- *
- * Since: 2.28
- */
-struct _GTlsBackendInterface
-{
-  GTypeInterface g_iface;
-
-  /* methods */
-  gboolean       ( *supports_tls)               (GTlsBackend *backend);
-  GType          ( *get_certificate_type)       (void);
-  GType          ( *get_client_connection_type) (void);
-  GType          ( *get_server_connection_type) (void);
-  GType          ( *get_file_database_type)     (void);
-  GTlsDatabase * ( *get_default_database)       (GTlsBackend *backend);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType          g_tls_backend_get_type                   (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GTlsBackend *  g_tls_backend_get_default                (void);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsDatabase * g_tls_backend_get_default_database       (GTlsBackend *backend);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_tls_backend_supports_tls               (GTlsBackend *backend);
-
-GLIB_AVAILABLE_IN_ALL
-GType          g_tls_backend_get_certificate_type       (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_ALL
-GType          g_tls_backend_get_client_connection_type (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_ALL
-GType          g_tls_backend_get_server_connection_type (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_ALL
-GType          g_tls_backend_get_file_database_type     (GTlsBackend *backend);
-
-G_END_DECLS
-
-#endif /* __G_TLS_BACKEND_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtlscertificate.h b/linux-x86/include/glib-2.0/gio/gtlscertificate.h
deleted file mode 100644
index dd6c3a1..0000000
--- a/linux-x86/include/glib-2.0/gio/gtlscertificate.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_TLS_CERTIFICATE_H__
-#define __G_TLS_CERTIFICATE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_CERTIFICATE            (g_tls_certificate_get_type ())
-#define G_TLS_CERTIFICATE(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_CERTIFICATE, GTlsCertificate))
-#define G_TLS_CERTIFICATE_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TLS_CERTIFICATE, GTlsCertificateClass))
-#define G_IS_TLS_CERTIFICATE(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_CERTIFICATE))
-#define G_IS_TLS_CERTIFICATE_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TLS_CERTIFICATE))
-#define G_TLS_CERTIFICATE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), G_TYPE_TLS_CERTIFICATE, GTlsCertificateClass))
-
-typedef struct _GTlsCertificateClass   GTlsCertificateClass;
-typedef struct _GTlsCertificatePrivate GTlsCertificatePrivate;
-
-struct _GTlsCertificate {
-  GObject parent_instance;
-
-  GTlsCertificatePrivate *priv;
-};
-
-struct _GTlsCertificateClass
-{
-  GObjectClass parent_class;
-
-  GTlsCertificateFlags  (* verify) (GTlsCertificate     *cert,
-				    GSocketConnectable  *identity,
-				    GTlsCertificate     *trusted_ca);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[8];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                 g_tls_certificate_get_type           (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificate      *g_tls_certificate_new_from_pem       (const gchar         *data,
-							    gssize               length,
-							    GError             **error);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificate      *g_tls_certificate_new_from_file      (const gchar         *file,
-							    GError             **error);
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificate      *g_tls_certificate_new_from_files     (const gchar         *cert_file,
-							    const gchar         *key_file,
-							    GError             **error);
-GLIB_AVAILABLE_IN_ALL
-GList                *g_tls_certificate_list_new_from_file (const gchar         *file,
-							    GError             **error);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificate      *g_tls_certificate_get_issuer         (GTlsCertificate     *cert);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificateFlags  g_tls_certificate_verify             (GTlsCertificate     *cert,
-							    GSocketConnectable  *identity,
-							    GTlsCertificate     *trusted_ca);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean              g_tls_certificate_is_same            (GTlsCertificate     *cert_one,
-                                                            GTlsCertificate     *cert_two);
-
-G_END_DECLS
-
-#endif /* __G_TLS_CERTIFICATE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtlsclientconnection.h b/linux-x86/include/glib-2.0/gio/gtlsclientconnection.h
deleted file mode 100644
index aa216f4..0000000
--- a/linux-x86/include/glib-2.0/gio/gtlsclientconnection.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_TLS_CLIENT_CONNECTION_H__
-#define __G_TLS_CLIENT_CONNECTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gtlsconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_CLIENT_CONNECTION                (g_tls_client_connection_get_type ())
-#define G_TLS_CLIENT_CONNECTION(inst)               (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_CLIENT_CONNECTION, GTlsClientConnection))
-#define G_IS_TLS_CLIENT_CONNECTION(inst)            (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_CLIENT_CONNECTION))
-#define G_TLS_CLIENT_CONNECTION_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TLS_CLIENT_CONNECTION, GTlsClientConnectionInterface))
-
-typedef struct _GTlsClientConnectionInterface GTlsClientConnectionInterface;
-
-struct _GTlsClientConnectionInterface
-{
-  GTypeInterface g_iface;
-
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                 g_tls_client_connection_get_type             (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GIOStream *           g_tls_client_connection_new                  (GIOStream               *base_io_stream,
-								    GSocketConnectable      *server_identity,
-								    GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificateFlags  g_tls_client_connection_get_validation_flags (GTlsClientConnection    *conn);
-GLIB_AVAILABLE_IN_ALL
-void                  g_tls_client_connection_set_validation_flags (GTlsClientConnection    *conn,
-								    GTlsCertificateFlags     flags);
-GLIB_AVAILABLE_IN_ALL
-GSocketConnectable   *g_tls_client_connection_get_server_identity  (GTlsClientConnection    *conn);
-GLIB_AVAILABLE_IN_ALL
-void                  g_tls_client_connection_set_server_identity  (GTlsClientConnection    *conn,
-								    GSocketConnectable      *identity);
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_tls_client_connection_get_use_ssl3         (GTlsClientConnection    *conn);
-GLIB_AVAILABLE_IN_ALL
-void                  g_tls_client_connection_set_use_ssl3         (GTlsClientConnection    *conn,
-								    gboolean                 use_ssl3);
-GLIB_AVAILABLE_IN_ALL
-GList *               g_tls_client_connection_get_accepted_cas     (GTlsClientConnection    *conn);
-
-G_END_DECLS
-
-#endif /* __G_TLS_CLIENT_CONNECTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtlsconnection.h b/linux-x86/include/glib-2.0/gio/gtlsconnection.h
deleted file mode 100644
index 465c936..0000000
--- a/linux-x86/include/glib-2.0/gio/gtlsconnection.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_TLS_CONNECTION_H__
-#define __G_TLS_CONNECTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giostream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_CONNECTION            (g_tls_connection_get_type ())
-#define G_TLS_CONNECTION(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_CONNECTION, GTlsConnection))
-#define G_TLS_CONNECTION_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TLS_CONNECTION, GTlsConnectionClass))
-#define G_IS_TLS_CONNECTION(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_CONNECTION))
-#define G_IS_TLS_CONNECTION_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TLS_CONNECTION))
-#define G_TLS_CONNECTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), G_TYPE_TLS_CONNECTION, GTlsConnectionClass))
-
-typedef struct _GTlsConnectionClass   GTlsConnectionClass;
-typedef struct _GTlsConnectionPrivate GTlsConnectionPrivate;
-
-struct _GTlsConnection {
-  GIOStream parent_instance;
-
-  GTlsConnectionPrivate *priv;
-};
-
-struct _GTlsConnectionClass
-{
-  GIOStreamClass parent_class;
-
-  /* signals */
-  gboolean          ( *accept_certificate) (GTlsConnection       *connection,
-					    GTlsCertificate      *peer_cert,
-					    GTlsCertificateFlags  errors);
-
-  /* methods */
-  gboolean ( *handshake )        (GTlsConnection       *conn,
-				  GCancellable         *cancellable,
-				  GError              **error);
-
-  void     ( *handshake_async )  (GTlsConnection       *conn,
-				  int                   io_priority,
-				  GCancellable         *cancellable,
-				  GAsyncReadyCallback   callback,
-				  gpointer              user_data);
-  gboolean ( *handshake_finish ) (GTlsConnection       *conn,
-				  GAsyncResult         *result,
-				  GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[8];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                 g_tls_connection_get_type                    (void) G_GNUC_CONST;
-
-GLIB_DEPRECATED
-void                  g_tls_connection_set_use_system_certdb       (GTlsConnection       *conn,
-                                                                    gboolean              use_system_certdb);
-GLIB_DEPRECATED
-gboolean              g_tls_connection_get_use_system_certdb       (GTlsConnection       *conn);
-
-GLIB_AVAILABLE_IN_ALL
-void                  g_tls_connection_set_database                (GTlsConnection       *conn,
-								    GTlsDatabase         *database);
-GLIB_AVAILABLE_IN_ALL
-GTlsDatabase *        g_tls_connection_get_database                (GTlsConnection       *conn);
-
-GLIB_AVAILABLE_IN_ALL
-void                  g_tls_connection_set_certificate             (GTlsConnection       *conn,
-                                                                    GTlsCertificate      *certificate);
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificate      *g_tls_connection_get_certificate             (GTlsConnection       *conn);
-
-GLIB_AVAILABLE_IN_ALL
-void                  g_tls_connection_set_interaction             (GTlsConnection       *conn,
-                                                                    GTlsInteraction      *interaction);
-GLIB_AVAILABLE_IN_ALL
-GTlsInteraction *     g_tls_connection_get_interaction             (GTlsConnection       *conn);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificate      *g_tls_connection_get_peer_certificate        (GTlsConnection       *conn);
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificateFlags  g_tls_connection_get_peer_certificate_errors (GTlsConnection       *conn);
-
-GLIB_AVAILABLE_IN_ALL
-void                  g_tls_connection_set_require_close_notify    (GTlsConnection       *conn,
-								    gboolean              require_close_notify);
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_tls_connection_get_require_close_notify    (GTlsConnection       *conn);
-
-GLIB_AVAILABLE_IN_ALL
-void                  g_tls_connection_set_rehandshake_mode        (GTlsConnection       *conn,
-								    GTlsRehandshakeMode   mode);
-GLIB_AVAILABLE_IN_ALL
-GTlsRehandshakeMode   g_tls_connection_get_rehandshake_mode        (GTlsConnection       *conn);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_tls_connection_handshake                   (GTlsConnection       *conn,
-								    GCancellable         *cancellable,
-								    GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                  g_tls_connection_handshake_async             (GTlsConnection       *conn,
-								    int                   io_priority,
-								    GCancellable         *cancellable,
-								    GAsyncReadyCallback   callback,
-								    gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_tls_connection_handshake_finish            (GTlsConnection       *conn,
-								    GAsyncResult         *result,
-								    GError              **error);
-
-/**
- * G_TLS_ERROR:
- *
- * Error domain for TLS. Errors in this domain will be from the
- * #GTlsError enumeration. See #GError for more information on error
- * domains.
- */
-#define G_TLS_ERROR (g_tls_error_quark ())
-GLIB_AVAILABLE_IN_ALL
-GQuark g_tls_error_quark (void);
-
-
-/*< protected >*/
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_tls_connection_emit_accept_certificate     (GTlsConnection       *conn,
-								    GTlsCertificate      *peer_cert,
-								    GTlsCertificateFlags  errors);
-
-G_END_DECLS
-
-#endif /* __G_TLS_CONNECTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtlsdatabase.h b/linux-x86/include/glib-2.0/gio/gtlsdatabase.h
deleted file mode 100644
index c11ca7a..0000000
--- a/linux-x86/include/glib-2.0/gio/gtlsdatabase.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#ifndef __G_TLS_DATABASE_H__
-#define __G_TLS_DATABASE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TLS_DATABASE_PURPOSE_AUTHENTICATE_SERVER "1.3.6.1.5.5.7.3.1"
-#define G_TLS_DATABASE_PURPOSE_AUTHENTICATE_CLIENT "1.3.6.1.5.5.7.3.2"
-
-#define G_TYPE_TLS_DATABASE            (g_tls_database_get_type ())
-#define G_TLS_DATABASE(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_DATABASE, GTlsDatabase))
-#define G_TLS_DATABASE_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TLS_DATABASE, GTlsDatabaseClass))
-#define G_IS_TLS_DATABASE(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_DATABASE))
-#define G_IS_TLS_DATABASE_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TLS_DATABASE))
-#define G_TLS_DATABASE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), G_TYPE_TLS_DATABASE, GTlsDatabaseClass))
-
-typedef struct _GTlsDatabaseClass   GTlsDatabaseClass;
-typedef struct _GTlsDatabasePrivate GTlsDatabasePrivate;
-
-struct _GTlsDatabase
-{
-  GObject parent_instance;
-
-  GTlsDatabasePrivate *priv;
-};
-
-struct _GTlsDatabaseClass
-{
-  GObjectClass parent_class;
-
-  /* virtual methods */
-
-  GTlsCertificateFlags  (*verify_chain)                         (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *chain,
-                                                                 const gchar             *purpose,
-                                                                 GSocketConnectable      *identity,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseVerifyFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*verify_chain_async)                   (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *chain,
-                                                                 const gchar             *purpose,
-                                                                 GSocketConnectable      *identity,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseVerifyFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GTlsCertificateFlags  (*verify_chain_finish)                  (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  gchar*                (*create_certificate_handle)            (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *certificate);
-
-  GTlsCertificate*      (*lookup_certificate_for_handle)        (GTlsDatabase            *self,
-                                                                 const gchar             *handle,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*lookup_certificate_for_handle_async)  (GTlsDatabase            *self,
-                                                                 const gchar             *handle,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GTlsCertificate*      (*lookup_certificate_for_handle_finish) (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  GTlsCertificate*      (*lookup_certificate_issuer)            (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *certificate,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*lookup_certificate_issuer_async)      (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *certificate,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GTlsCertificate*      (*lookup_certificate_issuer_finish)     (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  GList*                (*lookup_certificates_issued_by)        (GTlsDatabase            *self,
-                                                                 GByteArray              *issuer_raw_dn,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*lookup_certificates_issued_by_async)  (GTlsDatabase            *self,
-                                                                 GByteArray              *issuer_raw_dn,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GList*                (*lookup_certificates_issued_by_finish) (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[16];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                g_tls_database_get_type                              (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificateFlags g_tls_database_verify_chain                          (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *chain,
-                                                                           const gchar             *purpose,
-                                                                           GSocketConnectable      *identity,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseVerifyFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                 g_tls_database_verify_chain_async                    (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *chain,
-                                                                           const gchar             *purpose,
-                                                                           GSocketConnectable      *identity,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseVerifyFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GAsyncReadyCallback      callback,
-                                                                           gpointer                 user_data);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificateFlags g_tls_database_verify_chain_finish                   (GTlsDatabase            *self,
-                                                                           GAsyncResult            *result,
-                                                                           GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-gchar*               g_tls_database_create_certificate_handle             (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *certificate);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificate*     g_tls_database_lookup_certificate_for_handle         (GTlsDatabase            *self,
-                                                                           const gchar             *handle,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                 g_tls_database_lookup_certificate_for_handle_async   (GTlsDatabase            *self,
-                                                                           const gchar             *handle,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GAsyncReadyCallback      callback,
-                                                                           gpointer                 user_data);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificate*     g_tls_database_lookup_certificate_for_handle_finish  (GTlsDatabase            *self,
-                                                                           GAsyncResult            *result,
-                                                                           GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificate*     g_tls_database_lookup_certificate_issuer             (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *certificate,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                 g_tls_database_lookup_certificate_issuer_async       (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *certificate,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GAsyncReadyCallback      callback,
-                                                                           gpointer                 user_data);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsCertificate*     g_tls_database_lookup_certificate_issuer_finish      (GTlsDatabase            *self,
-                                                                           GAsyncResult            *result,
-                                                                           GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-GList*               g_tls_database_lookup_certificates_issued_by         (GTlsDatabase            *self,
-                                                                           GByteArray              *issuer_raw_dn,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                 g_tls_database_lookup_certificates_issued_by_async    (GTlsDatabase            *self,
-                                                                            GByteArray              *issuer_raw_dn,
-                                                                            GTlsInteraction         *interaction,
-                                                                            GTlsDatabaseLookupFlags  flags,
-                                                                            GCancellable            *cancellable,
-                                                                            GAsyncReadyCallback      callback,
-                                                                            gpointer                 user_data);
-
-GLIB_AVAILABLE_IN_ALL
-GList*               g_tls_database_lookup_certificates_issued_by_finish   (GTlsDatabase            *self,
-                                                                            GAsyncResult            *result,
-                                                                            GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_DATABASE_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtlsfiledatabase.h b/linux-x86/include/glib-2.0/gio/gtlsfiledatabase.h
deleted file mode 100644
index 5024949..0000000
--- a/linux-x86/include/glib-2.0/gio/gtlsfiledatabase.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2010 Collabora, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * See the included COPYING file for more information.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#ifndef __G_TLS_FILE_DATABASE_H__
-#define __G_TLS_FILE_DATABASE_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_FILE_DATABASE                (g_tls_file_database_get_type ())
-#define G_TLS_FILE_DATABASE(inst)               (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_FILE_DATABASE, GTlsFileDatabase))
-#define G_IS_TLS_FILE_DATABASE(inst)            (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_FILE_DATABASE))
-#define G_TLS_FILE_DATABASE_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TLS_FILE_DATABASE, GTlsFileDatabaseInterface))
-
-typedef struct _GTlsFileDatabaseInterface GTlsFileDatabaseInterface;
-
-/**
- * GTlsFileDatabaseInterface:
- * @g_iface: The parent interface.
- *
- * Provides an interface for #GTlsFileDatabase implementations.
- *
- */
-struct _GTlsFileDatabaseInterface
-{
-  GTypeInterface g_iface;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[8];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                        g_tls_file_database_get_type              (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GTlsDatabase*                g_tls_file_database_new                   (const gchar  *anchors,
-                                                                        GError      **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_FILE_DATABASE_H___ */
diff --git a/linux-x86/include/glib-2.0/gio/gtlsinteraction.h b/linux-x86/include/glib-2.0/gio/gtlsinteraction.h
deleted file mode 100644
index 283464e..0000000
--- a/linux-x86/include/glib-2.0/gio/gtlsinteraction.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2011 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#ifndef __G_TLS_INTERACTION_H__
-#define __G_TLS_INTERACTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_INTERACTION         (g_tls_interaction_get_type ())
-#define G_TLS_INTERACTION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_TLS_INTERACTION, GTlsInteraction))
-#define G_TLS_INTERACTION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_TLS_INTERACTION, GTlsInteractionClass))
-#define G_IS_TLS_INTERACTION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_TLS_INTERACTION))
-#define G_IS_TLS_INTERACTION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_TLS_INTERACTION))
-#define G_TLS_INTERACTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_TLS_INTERACTION, GTlsInteractionClass))
-
-typedef struct _GTlsInteractionClass   GTlsInteractionClass;
-typedef struct _GTlsInteractionPrivate GTlsInteractionPrivate;
-
-struct _GTlsInteraction
-{
-  /*< private >*/
-  GObject parent_instance;
-  GTlsInteractionPrivate *priv;
-};
-
-struct _GTlsInteractionClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< public >*/
-  GTlsInteractionResult  (* ask_password)        (GTlsInteraction    *interaction,
-                                                  GTlsPassword       *password,
-                                                  GCancellable       *cancellable,
-                                                  GError            **error);
-
-  void                   (* ask_password_async)  (GTlsInteraction    *interaction,
-                                                  GTlsPassword       *password,
-                                                  GCancellable       *cancellable,
-                                                  GAsyncReadyCallback callback,
-                                                  gpointer            user_data);
-
-  GTlsInteractionResult  (* ask_password_finish) (GTlsInteraction    *interaction,
-                                                  GAsyncResult       *result,
-                                                  GError            **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[24];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                  g_tls_interaction_get_type            (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GTlsInteractionResult  g_tls_interaction_invoke_ask_password (GTlsInteraction    *interaction,
-                                                              GTlsPassword       *password,
-                                                              GCancellable       *cancellable,
-                                                              GError            **error);
-
-
-GLIB_AVAILABLE_IN_ALL
-GTlsInteractionResult  g_tls_interaction_ask_password        (GTlsInteraction    *interaction,
-                                                              GTlsPassword       *password,
-                                                              GCancellable       *cancellable,
-                                                              GError            **error);
-
-GLIB_AVAILABLE_IN_ALL
-void                   g_tls_interaction_ask_password_async  (GTlsInteraction    *interaction,
-                                                              GTlsPassword       *password,
-                                                              GCancellable       *cancellable,
-                                                              GAsyncReadyCallback callback,
-                                                              gpointer            user_data);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsInteractionResult  g_tls_interaction_ask_password_finish (GTlsInteraction    *interaction,
-                                                              GAsyncResult       *result,
-                                                              GError            **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_INTERACTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtlspassword.h b/linux-x86/include/glib-2.0/gio/gtlspassword.h
deleted file mode 100644
index 3db365d..0000000
--- a/linux-x86/include/glib-2.0/gio/gtlspassword.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2011 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#ifndef __G_TLS_PASSWORD_H__
-#define __G_TLS_PASSWORD_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_PASSWORD         (g_tls_password_get_type ())
-#define G_TLS_PASSWORD(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_TLS_PASSWORD, GTlsPassword))
-#define G_TLS_PASSWORD_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_TLS_PASSWORD, GTlsPasswordClass))
-#define G_IS_TLS_PASSWORD(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_TLS_PASSWORD))
-#define G_IS_TLS_PASSWORD_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_TLS_PASSWORD))
-#define G_TLS_PASSWORD_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_TLS_PASSWORD, GTlsPasswordClass))
-
-typedef struct _GTlsPasswordClass   GTlsPasswordClass;
-typedef struct _GTlsPasswordPrivate GTlsPasswordPrivate;
-
-struct _GTlsPassword
-{
-  GObject parent_instance;
-
-  GTlsPasswordPrivate *priv;
-};
-
-struct _GTlsPasswordClass
-{
-  GObjectClass parent_class;
-
-  /* methods */
-
-  const guchar *    ( *get_value)            (GTlsPassword  *password,
-                                              gsize         *length);
-
-  void              ( *set_value)            (GTlsPassword  *password,
-                                              guchar        *value,
-                                              gssize         length,
-                                              GDestroyNotify destroy);
-
-  const gchar*      ( *get_default_warning)  (GTlsPassword  *password);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[4];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType             g_tls_password_get_type            (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GTlsPassword *    g_tls_password_new                 (GTlsPasswordFlags  flags,
-                                                      const gchar       *description);
-
-GLIB_AVAILABLE_IN_ALL
-const guchar *    g_tls_password_get_value           (GTlsPassword      *password,
-                                                      gsize             *length);
-GLIB_AVAILABLE_IN_ALL
-void              g_tls_password_set_value           (GTlsPassword      *password,
-                                                      const guchar      *value,
-                                                      gssize             length);
-GLIB_AVAILABLE_IN_ALL
-void              g_tls_password_set_value_full      (GTlsPassword      *password,
-                                                      guchar            *value,
-                                                      gssize             length,
-                                                      GDestroyNotify     destroy);
-
-GLIB_AVAILABLE_IN_ALL
-GTlsPasswordFlags g_tls_password_get_flags           (GTlsPassword      *password);
-GLIB_AVAILABLE_IN_ALL
-void              g_tls_password_set_flags           (GTlsPassword      *password,
-                                                      GTlsPasswordFlags  flags);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar*      g_tls_password_get_description     (GTlsPassword      *password);
-GLIB_AVAILABLE_IN_ALL
-void              g_tls_password_set_description     (GTlsPassword      *password,
-                                                      const gchar       *description);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *     g_tls_password_get_warning         (GTlsPassword      *password);
-GLIB_AVAILABLE_IN_ALL
-void              g_tls_password_set_warning         (GTlsPassword      *password,
-                                                      const gchar       *warning);
-
-G_END_DECLS
-
-#endif /* __G_TLS_PASSWORD_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gtlsserverconnection.h b/linux-x86/include/glib-2.0/gio/gtlsserverconnection.h
deleted file mode 100644
index 6550d19..0000000
--- a/linux-x86/include/glib-2.0/gio/gtlsserverconnection.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_TLS_SERVER_CONNECTION_H__
-#define __G_TLS_SERVER_CONNECTION_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gtlsconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_SERVER_CONNECTION                (g_tls_server_connection_get_type ())
-#define G_TLS_SERVER_CONNECTION(inst)               (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_SERVER_CONNECTION, GTlsServerConnection))
-#define G_IS_TLS_SERVER_CONNECTION(inst)            (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_SERVER_CONNECTION))
-#define G_TLS_SERVER_CONNECTION_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TLS_SERVER_CONNECTION, GTlsServerConnectionInterface))
-
-/**
- * GTlsServerConnection:
- *
- * TLS server-side connection. This is the server-side implementation
- * of a #GTlsConnection.
- *
- * Since: 2.28
- */
-typedef struct _GTlsServerConnectionInterface GTlsServerConnectionInterface;
-
-struct _GTlsServerConnectionInterface
-{
-  GTypeInterface g_iface;
-
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                 g_tls_server_connection_get_type                 (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GIOStream *           g_tls_server_connection_new                      (GIOStream        *base_io_stream,
-									GTlsCertificate  *certificate,
-									GError          **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_SERVER_CONNECTION_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gvfs.h b/linux-x86/include/glib-2.0/gio/gvfs.h
deleted file mode 100644
index 4150ae9..0000000
--- a/linux-x86/include/glib-2.0/gio/gvfs.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_VFS_H__
-#define __G_VFS_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_VFS         (g_vfs_get_type ())
-#define G_VFS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS, GVfs))
-#define G_VFS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS, GVfsClass))
-#define G_VFS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS, GVfsClass))
-#define G_IS_VFS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS))
-#define G_IS_VFS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS))
-
-/**
- * G_VFS_EXTENSION_POINT_NAME:
- *
- * Extension point for #GVfs functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_VFS_EXTENSION_POINT_NAME "gio-vfs"
-
-/**
- * GVfs:
- *
- * Virtual File System object.
- **/
-typedef struct _GVfsClass    GVfsClass;
-
-struct _GVfs
-{
-  GObject parent_instance;
-};
-
-struct _GVfsClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Table */
-
-  gboolean              (* is_active)                 (GVfs       *vfs);
-  GFile               * (* get_file_for_path)         (GVfs       *vfs,
-                                                       const char *path);
-  GFile               * (* get_file_for_uri)          (GVfs       *vfs,
-                                                       const char *uri);
-  const gchar * const * (* get_supported_uri_schemes) (GVfs       *vfs);
-  GFile               * (* parse_name)                (GVfs       *vfs,
-                                                       const char *parse_name);
-
-  /*< private >*/
-  void                  (* local_file_add_info)       (GVfs       *vfs,
-						       const char *filename,
-						       guint64     device,
-						       GFileAttributeMatcher *attribute_matcher,
-						       GFileInfo  *info,
-						       GCancellable *cancellable,
-						       gpointer   *extra_data,
-						       GDestroyNotify *free_extra_data);
-  void                  (* add_writable_namespaces)   (GVfs       *vfs,
-						       GFileAttributeInfoList *list);
-  gboolean              (* local_file_set_attributes) (GVfs       *vfs,
-						       const char *filename,
-						       GFileInfo  *info,
-                                                       GFileQueryInfoFlags flags,
-                                                       GCancellable *cancellable,
-						       GError    **error);
-  void                  (* local_file_removed)        (GVfs       *vfs,
-						       const char *filename);
-  void                  (* local_file_moved)          (GVfs       *vfs,
-						       const char *source,
-						       const char *dest);
-  GIcon *               (* deserialize_icon)          (GVfs       *vfs,
-                                                       GVariant   *value);
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType                 g_vfs_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_vfs_is_active                 (GVfs       *vfs);
-GLIB_AVAILABLE_IN_ALL
-GFile *               g_vfs_get_file_for_path         (GVfs       *vfs,
-                                                       const char *path);
-GLIB_AVAILABLE_IN_ALL
-GFile *               g_vfs_get_file_for_uri          (GVfs       *vfs,
-                                                       const char *uri);
-GLIB_AVAILABLE_IN_ALL
-const gchar* const * g_vfs_get_supported_uri_schemes  (GVfs       *vfs);
-
-GLIB_AVAILABLE_IN_ALL
-GFile *               g_vfs_parse_name                (GVfs       *vfs,
-                                                       const char *parse_name);
-
-GLIB_AVAILABLE_IN_ALL
-GVfs *                g_vfs_get_default               (void);
-GLIB_AVAILABLE_IN_ALL
-GVfs *                g_vfs_get_local                 (void);
-
-G_END_DECLS
-
-#endif /* __G_VFS_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gvolume.h b/linux-x86/include/glib-2.0/gio/gvolume.h
deleted file mode 100644
index 0a4abe0..0000000
--- a/linux-x86/include/glib-2.0/gio/gvolume.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_VOLUME_H__
-#define __G_VOLUME_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_HAL_UDI:
- *
- * The string used to obtain a Hal UDI with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_HAL_UDI "hal-udi"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE:
- *
- * The string used to obtain a Unix device path with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE "unix-device"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_LABEL:
- *
- * The string used to obtain a filesystem label with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_LABEL "label"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_UUID:
- *
- * The string used to obtain a UUID with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_UUID "uuid"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_NFS_MOUNT:
- *
- * The string used to obtain a NFS mount with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_NFS_MOUNT "nfs-mount"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_CLASS:
- *
- * The string used to obtain the volume <emphasis>class</emphasis>
- * with g_volume_get_identifier().
- *
- * Known volume classes include <literal>device</literal> and
- * <literal>network</literal>. Other classes may be added in the
- * future.
- *
- * This is intended to be used by applications to classify #GVolume
- * instances into different sections - for example a file manager or
- * file chooser can use this information to show
- * <literal>network</literal> volumes under a "Network" heading and
- * <literal>device</literal> volumes under a "Devices" heading.
- */
-#define G_VOLUME_IDENTIFIER_KIND_CLASS "class"
-
-
-#define G_TYPE_VOLUME            (g_volume_get_type ())
-#define G_VOLUME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_VOLUME, GVolume))
-#define G_IS_VOLUME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_VOLUME))
-#define G_VOLUME_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_VOLUME, GVolumeIface))
-
-/**
- * GVolumeIface:
- * @g_iface: The parent interface.
- * @changed: Changed signal that is emitted when the volume's state has changed.
- * @removed: The removed signal that is emitted when the #GVolume have been removed. If the recipient is holding references to the object they should release them so the object can be finalized.
- * @get_name: Gets a string containing the name of the #GVolume.
- * @get_icon: Gets a #GIcon for the #GVolume.
- * @get_uuid: Gets the UUID for the #GVolume. The reference is typically based on the file system UUID for the mount in question and should be considered an opaque string. Returns %NULL if there is no UUID available.
- * @get_drive: Gets a #GDrive the volume is located on. Returns %NULL if the #GVolume is not associated with a #GDrive.
- * @get_mount: Gets a #GMount representing the mounted volume. Returns %NULL if the #GVolume is not mounted.
- * @can_mount: Returns %TRUE if the #GVolume can be mounted.
- * @can_eject: Checks if a #GVolume can be ejected.
- * @mount_fn: Mounts a given #GVolume. 
- *     #GVolume implementations must emit the #GMountOperation::aborted 
- *     signal before completing a mount operation that is aborted while 
- *     awaiting input from the user through a #GMountOperation instance.
- * @mount_finish: Finishes a mount operation.
- * @eject: Ejects a given #GVolume.
- * @eject_finish: Finishes an eject operation.
- * @get_identifier: Returns the <link linkend="volume-identifier">identifier</link> of the given kind, or %NULL if
- *    the #GVolume doesn't have one.
- * @enumerate_identifiers: Returns an array strings listing the kinds
- *    of <link linkend="volume-identifier">identifiers</link> which the #GVolume has.
- * @should_automount: Returns %TRUE if the #GVolume should be automatically mounted.
- * @get_activation_root: Returns the activation root for the #GVolume if it is known in advance or %NULL if
- *   it is not known.
- * @eject_with_operation: Starts ejecting a #GVolume using a #GMountOperation. Since 2.22.
- * @eject_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @get_sort_key: Gets a key used for sorting #GVolume instance or %NULL if no such key exists. Since 2.32.
- * @get_symbolic_icon: Gets a symbolic #GIcon for the #GVolume. Since 2.34.
- *
- * Interface for implementing operations for mountable volumes.
- **/
-typedef struct _GVolumeIface    GVolumeIface;
-
-struct _GVolumeIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-
-  void        (* changed)               (GVolume             *volume);
-  void        (* removed)               (GVolume             *volume);
-
-  /* Virtual Table */
-
-  char      * (* get_name)              (GVolume             *volume);
-  GIcon     * (* get_icon)              (GVolume             *volume);
-  char      * (* get_uuid)              (GVolume             *volume);
-  GDrive    * (* get_drive)             (GVolume             *volume);
-  GMount    * (* get_mount)             (GVolume             *volume);
-  gboolean    (* can_mount)             (GVolume             *volume);
-  gboolean    (* can_eject)             (GVolume             *volume);
-  void        (* mount_fn)              (GVolume             *volume,
-                                         GMountMountFlags     flags,
-                                         GMountOperation     *mount_operation,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean    (* mount_finish)          (GVolume             *volume,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-  void        (* eject)                 (GVolume             *volume,
-                                         GMountUnmountFlags   flags,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean    (* eject_finish)          (GVolume             *volume,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-
-  char      * (* get_identifier)        (GVolume             *volume,
-                                         const char          *kind);
-  char     ** (* enumerate_identifiers) (GVolume             *volume);
-
-  gboolean    (* should_automount)      (GVolume             *volume);
-
-  GFile     * (* get_activation_root)   (GVolume             *volume);
-
-  void        (* eject_with_operation)      (GVolume             *volume,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_with_operation_finish) (GVolume           *volume,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  const gchar * (* get_sort_key)        (GVolume             *volume);
-  GIcon       * (* get_symbolic_icon)   (GVolume             *volume);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_volume_get_type              (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-char *   g_volume_get_name              (GVolume              *volume);
-GLIB_AVAILABLE_IN_ALL
-GIcon *  g_volume_get_icon              (GVolume              *volume);
-GLIB_AVAILABLE_IN_ALL
-GIcon *  g_volume_get_symbolic_icon     (GVolume              *volume);
-GLIB_AVAILABLE_IN_ALL
-char *   g_volume_get_uuid              (GVolume              *volume);
-GLIB_AVAILABLE_IN_ALL
-GDrive * g_volume_get_drive             (GVolume              *volume);
-GLIB_AVAILABLE_IN_ALL
-GMount * g_volume_get_mount             (GVolume              *volume);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_volume_can_mount             (GVolume              *volume);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_volume_can_eject             (GVolume              *volume);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_volume_should_automount      (GVolume              *volume);
-GLIB_AVAILABLE_IN_ALL
-void     g_volume_mount                 (GVolume              *volume,
-					 GMountMountFlags      flags,
-					 GMountOperation      *mount_operation,
-					 GCancellable         *cancellable,
-					 GAsyncReadyCallback   callback,
-					 gpointer              user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_volume_mount_finish          (GVolume              *volume,
-					 GAsyncResult         *result,
-					 GError              **error);
-GLIB_DEPRECATED_FOR(g_volume_eject_with_operation)
-void     g_volume_eject                 (GVolume              *volume,
-                                         GMountUnmountFlags    flags,
-                                         GCancellable         *cancellable,
-                                         GAsyncReadyCallback   callback,
-                                         gpointer              user_data);
-
-GLIB_DEPRECATED_FOR(g_volume_eject_with_operation_finish)
-gboolean g_volume_eject_finish          (GVolume              *volume,
-                                         GAsyncResult         *result,
-                                         GError              **error);
-GLIB_AVAILABLE_IN_ALL
-char *   g_volume_get_identifier        (GVolume              *volume,
-					 const char           *kind);
-GLIB_AVAILABLE_IN_ALL
-char **  g_volume_enumerate_identifiers (GVolume              *volume);
-
-GLIB_AVAILABLE_IN_ALL
-GFile *  g_volume_get_activation_root   (GVolume              *volume);
-
-GLIB_AVAILABLE_IN_ALL
-void        g_volume_eject_with_operation     (GVolume             *volume,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_volume_eject_with_operation_finish (GVolume          *volume,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_2_32
-const gchar *g_volume_get_sort_key            (GVolume              *volume);
-
-G_END_DECLS
-
-#endif /* __G_VOLUME_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gvolumemonitor.h b/linux-x86/include/glib-2.0/gio/gvolumemonitor.h
deleted file mode 100644
index 0a37e12..0000000
--- a/linux-x86/include/glib-2.0/gio/gvolumemonitor.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_VOLUME_MONITOR_H__
-#define __G_VOLUME_MONITOR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_VOLUME_MONITOR         (g_volume_monitor_get_type ())
-#define G_VOLUME_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VOLUME_MONITOR, GVolumeMonitor))
-#define G_VOLUME_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VOLUME_MONITOR, GVolumeMonitorClass))
-#define G_VOLUME_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VOLUME_MONITOR, GVolumeMonitorClass))
-#define G_IS_VOLUME_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VOLUME_MONITOR))
-#define G_IS_VOLUME_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VOLUME_MONITOR))
-
-/**
- * G_VOLUME_MONITOR_EXTENSION_POINT_NAME:
- *
- * Extension point for volume monitor functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-volume-monitor"
-
-/**
- * GVolumeMonitor:
- *
- * A Volume Monitor that watches for volume events.
- **/
-typedef struct _GVolumeMonitorClass GVolumeMonitorClass;
-
-struct _GVolumeMonitor
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  gpointer priv;
-};
-
-struct _GVolumeMonitorClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* signals */
-  void      (* volume_added)         (GVolumeMonitor *volume_monitor,
-                                      GVolume        *volume);
-  void      (* volume_removed)       (GVolumeMonitor *volume_monitor,
-                                      GVolume        *volume);
-  void      (* volume_changed)       (GVolumeMonitor *volume_monitor,
-                                      GVolume        *volume);
-
-  void      (* mount_added)          (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-  void      (* mount_removed)        (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-  void      (* mount_pre_unmount)    (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-  void      (* mount_changed)        (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-
-  void      (* drive_connected)      (GVolumeMonitor *volume_monitor,
-                                      GDrive	     *drive);
-  void      (* drive_disconnected)   (GVolumeMonitor *volume_monitor,
-                                      GDrive         *drive);
-  void      (* drive_changed)        (GVolumeMonitor *volume_monitor,
-                                      GDrive         *drive);
-
-  /* Vtable */
-
-  gboolean  (* is_supported)         (void);
-
-  GList   * (* get_connected_drives) (GVolumeMonitor *volume_monitor);
-  GList   * (* get_volumes)          (GVolumeMonitor *volume_monitor);
-  GList   * (* get_mounts)           (GVolumeMonitor *volume_monitor);
-
-  GVolume * (* get_volume_for_uuid)  (GVolumeMonitor *volume_monitor,
-                                      const char     *uuid);
-
-  GMount  * (* get_mount_for_uuid)   (GVolumeMonitor *volume_monitor,
-                                      const char     *uuid);
-
-
-  /* These arguments are unfortunately backwards by mistake (bug #520169). Deprecated in 2.20. */
-  GVolume * (* adopt_orphan_mount)   (GMount         *mount,
-                                      GVolumeMonitor *volume_monitor);
-
-  /* signal added in 2.17 */
-  void      (* drive_eject_button)   (GVolumeMonitor *volume_monitor,
-                                      GDrive         *drive);
-
-  /* signal added in 2.21 */
-  void      (* drive_stop_button)   (GVolumeMonitor *volume_monitor,
-                                     GDrive         *drive);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType           g_volume_monitor_get_type             (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GVolumeMonitor *g_volume_monitor_get                  (void);
-GLIB_AVAILABLE_IN_ALL
-GList *         g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor);
-GLIB_AVAILABLE_IN_ALL
-GList *         g_volume_monitor_get_volumes          (GVolumeMonitor *volume_monitor);
-GLIB_AVAILABLE_IN_ALL
-GList *         g_volume_monitor_get_mounts           (GVolumeMonitor *volume_monitor);
-GLIB_AVAILABLE_IN_ALL
-GVolume *       g_volume_monitor_get_volume_for_uuid  (GVolumeMonitor *volume_monitor,
-                                                       const char     *uuid);
-GLIB_AVAILABLE_IN_ALL
-GMount *        g_volume_monitor_get_mount_for_uuid   (GVolumeMonitor *volume_monitor,
-                                                       const char     *uuid);
-
-GLIB_DEPRECATED
-GVolume *       g_volume_monitor_adopt_orphan_mount   (GMount         *mount);
-
-G_END_DECLS
-
-#endif /* __G_VOLUME_MONITOR_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gzlibcompressor.h b/linux-x86/include/glib-2.0/gio/gzlibcompressor.h
deleted file mode 100644
index 609e42f..0000000
--- a/linux-x86/include/glib-2.0/gio/gzlibcompressor.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_ZLIB_COMPRESSOR_H__
-#define __G_ZLIB_COMPRESSOR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gconverter.h>
-#include <gio/gfileinfo.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ZLIB_COMPRESSOR         (g_zlib_compressor_get_type ())
-#define G_ZLIB_COMPRESSOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_ZLIB_COMPRESSOR, GZlibCompressor))
-#define G_ZLIB_COMPRESSOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_ZLIB_COMPRESSOR, GZlibCompressorClass))
-#define G_IS_ZLIB_COMPRESSOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_ZLIB_COMPRESSOR))
-#define G_IS_ZLIB_COMPRESSOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_ZLIB_COMPRESSOR))
-#define G_ZLIB_COMPRESSOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_ZLIB_COMPRESSOR, GZlibCompressorClass))
-
-typedef struct _GZlibCompressorClass   GZlibCompressorClass;
-
-struct _GZlibCompressorClass
-{
-  GObjectClass parent_class;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType            g_zlib_compressor_get_type (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GZlibCompressor *g_zlib_compressor_new (GZlibCompressorFormat format,
-					int level);
-
-GLIB_AVAILABLE_IN_ALL
-GFileInfo       *g_zlib_compressor_get_file_info (GZlibCompressor *compressor);
-GLIB_AVAILABLE_IN_ALL
-void             g_zlib_compressor_set_file_info (GZlibCompressor *compressor,
-                                                  GFileInfo       *file_info);
-
-G_END_DECLS
-
-#endif /* __G_ZLIB_COMPRESSOR_H__ */
diff --git a/linux-x86/include/glib-2.0/gio/gzlibdecompressor.h b/linux-x86/include/glib-2.0/gio/gzlibdecompressor.h
deleted file mode 100644
index ecc4f4e..0000000
--- a/linux-x86/include/glib-2.0/gio/gzlibdecompressor.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_ZLIB_DECOMPRESSOR_H__
-#define __G_ZLIB_DECOMPRESSOR_H__
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#include <gio/gconverter.h>
-#include <gio/gfileinfo.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ZLIB_DECOMPRESSOR         (g_zlib_decompressor_get_type ())
-#define G_ZLIB_DECOMPRESSOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_ZLIB_DECOMPRESSOR, GZlibDecompressor))
-#define G_ZLIB_DECOMPRESSOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_ZLIB_DECOMPRESSOR, GZlibDecompressorClass))
-#define G_IS_ZLIB_DECOMPRESSOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_ZLIB_DECOMPRESSOR))
-#define G_IS_ZLIB_DECOMPRESSOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_ZLIB_DECOMPRESSOR))
-#define G_ZLIB_DECOMPRESSOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_ZLIB_DECOMPRESSOR, GZlibDecompressorClass))
-
-typedef struct _GZlibDecompressorClass   GZlibDecompressorClass;
-
-struct _GZlibDecompressorClass
-{
-  GObjectClass parent_class;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GType              g_zlib_decompressor_get_type (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GZlibDecompressor *g_zlib_decompressor_new (GZlibCompressorFormat format);
-
-GLIB_AVAILABLE_IN_ALL
-GFileInfo         *g_zlib_decompressor_get_file_info (GZlibDecompressor *decompressor);
-
-G_END_DECLS
-
-#endif /* __G_ZLIB_DECOMPRESSOR_H__ */
diff --git a/linux-x86/include/glib-2.0/glib-object.h b/linux-x86/include/glib-2.0/glib-object.h
deleted file mode 100644
index 336ba93..0000000
--- a/linux-x86/include/glib-2.0/glib-object.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GLIB_GOBJECT_H__
-#define __GLIB_GOBJECT_H__
-
-#define __GLIB_GOBJECT_H_INSIDE__
-
-/* topmost include file for GObject header files */
-#include <gobject/gbinding.h>
-#include <gobject/gboxed.h>
-#include <gobject/genums.h>
-#include <gobject/gobject.h>
-#include <gobject/gparam.h>
-#include <gobject/gparamspecs.h>
-#include <gobject/gsignal.h>
-#include <gobject/gsourceclosure.h>
-#include <gobject/gtype.h>
-#include <gobject/gtypemodule.h>
-#include <gobject/gtypeplugin.h>
-#include <gobject/gvalue.h>
-#include <gobject/gvaluearray.h>
-#include <gobject/gvaluetypes.h>
-
-#undef __GLIB_GOBJECT_H_INSIDE__
-
-#endif /* __GLIB_GOBJECT_H__ */
diff --git a/linux-x86/include/glib-2.0/glib-unix.h b/linux-x86/include/glib-2.0/glib-unix.h
deleted file mode 100644
index 66ccf74..0000000
--- a/linux-x86/include/glib-2.0/glib-unix.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* glib-unix.h - Unix specific integration
- * Copyright (C) 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_UNIX_H__
-#define __G_UNIX_H__
-
-/* We need to include the UNIX headers needed to use the APIs below,
- * but we also take this opportunity to include a wide selection of
- * other UNIX headers.  If one of the headers below is broken on some
- * system, work around it here (or better, fix the system or tell
- * people to use a better one).
- */
-#include <unistd.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#include <glib.h>
-
-#ifndef G_OS_UNIX
-#error "This header may only be used on UNIX"
-#endif
-
-G_BEGIN_DECLS
-
-/**
- * G_UNIX_ERROR:
- *
- * Error domain for API in the "g_unix_" namespace.  Note that there is
- * no exported enumeration mapping %errno.  Instead, all functions
- * ensure that %errno is relevant.  The code for all #G_UNIX_ERROR is
- * always <literal>0</literal>, and the error message is always
- * generated via g_strerror().
- *
- * It is expected that most code will not look at %errno from these
- * APIs. Important cases where one would want to differentiate between
- * errors are already covered by existing cross-platform GLib API,
- * such as e.g. #GFile wrapping <literal>ENOENT</literal>.  However, it is
- * provided for completeness, at least.
- */
-#define G_UNIX_ERROR (g_unix_error_quark())
-
-GLIB_AVAILABLE_IN_2_30
-GQuark g_unix_error_quark (void);
-
-GLIB_AVAILABLE_IN_2_30
-gboolean g_unix_open_pipe (gint    *fds,
-                           gint     flags,
-                           GError **error);
-
-GLIB_AVAILABLE_IN_2_30
-gboolean g_unix_set_fd_nonblocking (gint       fd,
-                                    gboolean   nonblock,
-                                    GError   **error);
-
-GLIB_AVAILABLE_IN_2_30
-GSource *g_unix_signal_source_new  (gint signum);
-
-GLIB_AVAILABLE_IN_2_30
-guint    g_unix_signal_add_full    (gint           priority,
-                                    gint           signum,
-                                    GSourceFunc    handler,
-                                    gpointer       user_data,
-                                    GDestroyNotify notify);
-
-GLIB_AVAILABLE_IN_2_30
-guint    g_unix_signal_add         (gint        signum,
-                                    GSourceFunc handler,
-                                    gpointer    user_data);
-
-/**
- * GUnixFDSourceFunc:
- * @fd: the fd that triggered the event
- * @condition: the IO conditions reported on @fd
- * @user_data: user data passed to g_unix_fd_add()
- *
- * The type of functions to be called when a UNIX fd watch source
- * triggers.
- *
- * Returns: %FALSE if the source should be removed
- **/
-typedef gboolean (*GUnixFDSourceFunc) (gint         fd,
-                                       GIOCondition condition,
-                                       gpointer     user_data);
-
-GLIB_AVAILABLE_IN_2_36
-GSource *g_unix_fd_source_new      (gint         fd,
-                                    GIOCondition condition);
-
-GLIB_AVAILABLE_IN_2_36
-guint    g_unix_fd_add_full        (gint              priority,
-                                    gint              fd,
-                                    GIOCondition      condition,
-                                    GUnixFDSourceFunc function,
-                                    gpointer          user_data,
-                                    GDestroyNotify    notify);
-
-GLIB_AVAILABLE_IN_2_36
-guint    g_unix_fd_add             (gint              fd,
-                                    GIOCondition      condition,
-                                    GUnixFDSourceFunc function,
-                                    gpointer          user_data);
-
-G_END_DECLS
-
-#endif  /* __G_UNIX_H__ */
diff --git a/linux-x86/include/glib-2.0/glib.h b/linux-x86/include/glib-2.0/glib.h
deleted file mode 100644
index ce7447e..0000000
--- a/linux-x86/include/glib-2.0/glib.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_LIB_H__
-#define __G_LIB_H__
-
-#define __GLIB_H_INSIDE__
-
-#include <glib/galloca.h>
-#include <glib/garray.h>
-#include <glib/gasyncqueue.h>
-#include <glib/gatomic.h>
-#include <glib/gbacktrace.h>
-#include <glib/gbase64.h>
-#include <glib/gbitlock.h>
-#include <glib/gbookmarkfile.h>
-#include <glib/gbytes.h>
-#include <glib/gcharset.h>
-#include <glib/gchecksum.h>
-#include <glib/gconvert.h>
-#include <glib/gdataset.h>
-#include <glib/gdate.h>
-#include <glib/gdatetime.h>
-#include <glib/gdir.h>
-#include <glib/genviron.h>
-#include <glib/gerror.h>
-#include <glib/gfileutils.h>
-#include <glib/ggettext.h>
-#include <glib/ghash.h>
-#include <glib/ghmac.h>
-#include <glib/ghook.h>
-#include <glib/ghostutils.h>
-#include <glib/giochannel.h>
-#include <glib/gkeyfile.h>
-#include <glib/glist.h>
-#include <glib/gmacros.h>
-#include <glib/gmain.h>
-#include <glib/gmappedfile.h>
-#include <glib/gmarkup.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gnode.h>
-#include <glib/goption.h>
-#include <glib/gpattern.h>
-#include <glib/gpoll.h>
-#include <glib/gprimes.h>
-#include <glib/gqsort.h>
-#include <glib/gquark.h>
-#include <glib/gqueue.h>
-#include <glib/grand.h>
-#include <glib/gregex.h>
-#include <glib/gscanner.h>
-#include <glib/gsequence.h>
-#include <glib/gshell.h>
-#include <glib/gslice.h>
-#include <glib/gslist.h>
-#include <glib/gspawn.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstring.h>
-#include <glib/gstringchunk.h>
-#include <glib/gtestutils.h>
-#include <glib/gthread.h>
-#include <glib/gthreadpool.h>
-#include <glib/gtimer.h>
-#include <glib/gtimezone.h>
-#include <glib/gtrashstack.h>
-#include <glib/gtree.h>
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gurifuncs.h>
-#include <glib/gutils.h>
-#include <glib/gvarianttype.h>
-#include <glib/gvariant.h>
-#include <glib/gversion.h>
-#include <glib/gversionmacros.h>
-#ifdef G_PLATFORM_WIN32
-#include <glib/gwin32.h>
-#endif
-
-#ifndef G_DISABLE_DEPRECATED
-#include <glib/deprecated/gallocator.h>
-#include <glib/deprecated/gcache.h>
-#include <glib/deprecated/gcompletion.h>
-#include <glib/deprecated/gmain.h>
-#include <glib/deprecated/grel.h>
-#include <glib/deprecated/gthread.h>
-#endif /* G_DISABLE_DEPRECATED */
-
-#undef __GLIB_H_INSIDE__
-
-#endif /* __G_LIB_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/deprecated/gallocator.h b/linux-x86/include/glib-2.0/glib/deprecated/gallocator.h
deleted file mode 100644
index a3dc2a1..0000000
--- a/linux-x86/include/glib-2.0/glib/deprecated/gallocator.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_ALLOCATOR_H__
-#define __G_ALLOCATOR_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAllocator GAllocator;
-typedef struct _GMemChunk  GMemChunk;
-
-#define G_ALLOC_ONLY                    1
-#define G_ALLOC_AND_FREE                2
-#define G_ALLOCATOR_LIST                1
-#define G_ALLOCATOR_SLIST               2
-#define G_ALLOCATOR_NODE                3
-
-#define g_chunk_new(type, chunk)        ((type *) g_mem_chunk_alloc (chunk))
-#define g_chunk_new0(type, chunk)       ((type *) g_mem_chunk_alloc0 (chunk))
-#define g_chunk_free(mem, mem_chunk)    (g_mem_chunk_free (mem_chunk, mem))
-#define g_mem_chunk_create(type, x, y)  (g_mem_chunk_new (NULL, sizeof (type), 0, 0))
-
-
-GLIB_DEPRECATED
-GMemChunk *     g_mem_chunk_new         (const gchar  *name,
-                                         gint          atom_size,
-                                         gsize         area_size,
-                                         gint          type);
-GLIB_DEPRECATED
-void            g_mem_chunk_destroy     (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-gpointer        g_mem_chunk_alloc       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-gpointer        g_mem_chunk_alloc0      (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_free        (GMemChunk    *mem_chunk,
-                                         gpointer      mem);
-GLIB_DEPRECATED
-void            g_mem_chunk_clean       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_reset       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_print       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_info        (void);
-GLIB_DEPRECATED
-void            g_blow_chunks           (void);
-
-
-GLIB_DEPRECATED
-GAllocator *    g_allocator_new         (const gchar  *name,
-                                         guint         n_preallocs);
-GLIB_DEPRECATED
-void            g_allocator_free        (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_list_push_allocator   (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_list_pop_allocator    (void);
-GLIB_DEPRECATED
-void            g_slist_push_allocator  (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_slist_pop_allocator   (void);
-GLIB_DEPRECATED
-void            g_node_push_allocator   (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_node_pop_allocator    (void);
-
-G_END_DECLS
-
-#endif /* __G_ALLOCATOR_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/deprecated/gcache.h b/linux-x86/include/glib-2.0/glib/deprecated/gcache.h
deleted file mode 100644
index a7854e0..0000000
--- a/linux-x86/include/glib-2.0/glib/deprecated/gcache.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_CACHE_H__
-#define __G_CACHE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GCache          GCache;
-
-typedef gpointer        (*GCacheNewFunc)        (gpointer       key);
-typedef gpointer        (*GCacheDupFunc)        (gpointer       value);
-typedef void            (*GCacheDestroyFunc)    (gpointer       value);
-
-/* Caches
- */
-GLIB_DEPRECATED
-GCache*  g_cache_new           (GCacheNewFunc      value_new_func,
-                                GCacheDestroyFunc  value_destroy_func,
-                                GCacheDupFunc      key_dup_func,
-                                GCacheDestroyFunc  key_destroy_func,
-                                GHashFunc          hash_key_func,
-                                GHashFunc          hash_value_func,
-                                GEqualFunc         key_equal_func);
-GLIB_DEPRECATED
-void     g_cache_destroy       (GCache            *cache);
-GLIB_DEPRECATED
-gpointer g_cache_insert        (GCache            *cache,
-                                gpointer           key);
-GLIB_DEPRECATED
-void     g_cache_remove        (GCache            *cache,
-                                gconstpointer      value);
-GLIB_DEPRECATED
-void     g_cache_key_foreach   (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-GLIB_DEPRECATED
-void     g_cache_value_foreach (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-
-G_END_DECLS
-
-#endif /* __G_CACHE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/deprecated/gcompletion.h b/linux-x86/include/glib-2.0/glib/deprecated/gcompletion.h
deleted file mode 100644
index fa77596..0000000
--- a/linux-x86/include/glib-2.0/glib/deprecated/gcompletion.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_COMPLETION_H__
-#define __G_COMPLETION_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GCompletion     GCompletion;
-
-typedef gchar*          (*GCompletionFunc)      (gpointer);
-
-/* GCompletion
- */
-
-typedef gint (*GCompletionStrncmpFunc) (const gchar *s1,
-                                        const gchar *s2,
-                                        gsize        n);
-
-struct _GCompletion
-{
-  GList* items;
-  GCompletionFunc func;
- 
-  gchar* prefix;
-  GList* cache;
-  GCompletionStrncmpFunc strncmp_func;
-};
-
-GLIB_DEPRECATED_IN_2_26
-GCompletion* g_completion_new           (GCompletionFunc func);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_add_items     (GCompletion*    cmp,
-                                         GList*          items);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_remove_items  (GCompletion*    cmp,
-                                         GList*          items);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_clear_items   (GCompletion*    cmp);
-GLIB_DEPRECATED_IN_2_26
-GList*       g_completion_complete      (GCompletion*    cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-GLIB_DEPRECATED_IN_2_26
-GList*       g_completion_complete_utf8 (GCompletion  *cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_set_compare   (GCompletion *cmp,
-                                         GCompletionStrncmpFunc strncmp_func);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_free          (GCompletion*    cmp);
-
-G_END_DECLS
-
-#endif /* __G_COMPLETION_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/deprecated/gmain.h b/linux-x86/include/glib-2.0/glib/deprecated/gmain.h
deleted file mode 100644
index bb62240..0000000
--- a/linux-x86/include/glib-2.0/glib/deprecated/gmain.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_DEPRECATED_MAIN_H__
-#define __G_DEPRECATED_MAIN_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gmain.h>
-
-G_BEGIN_DECLS
-
-/* ============== Compat main loop stuff ================== */
-
-/**
- * g_main_new:
- * @is_running: set to %TRUE to indicate that the loop is running. This
- *     is not very important since calling g_main_run() will set this
- *     to %TRUE anyway.
- *
- * Creates a new #GMainLoop for th default main context.
- *
- * Returns: a new #GMainLoop
- *
- * Deprecated: 2.2: Use g_main_loop_new() instead
- */
-#define         g_main_new(is_running)  g_main_loop_new (NULL, is_running)
-
-/**
- * g_main_run:
- * @loop: a #GMainLoop
- *
- * Runs a main loop until it stops running.
- *
- * Deprecated: 2.2: Use g_main_loop_run() instead
- */
-#define         g_main_run(loop)        g_main_loop_run(loop)
-
-/**
- * g_main_quit:
- * @loop: a #GMainLoop
- *
- * Stops the #GMainLoop.
- * If g_main_run() was called to run the #GMainLoop, it will now return.
- *
- * Deprecated: 2.2: Use g_main_loop_quit() instead
- */
-#define g_main_quit(loop)       g_main_loop_quit(loop)
-
-/**
- * g_main_destroy:
- * @loop: a #GMainLoop
- *
- * Frees the memory allocated for the #GMainLoop.
- *
- * Deprecated: 2.2: Use g_main_loop_unref() instead
- */
-#define g_main_destroy(loop)    g_main_loop_unref(loop)
-
-/**
- * g_main_is_running:
- * @loop: a #GMainLoop
- *
- * Checks if the main loop is running.
- *
- * Returns: %TRUE if the main loop is running
- *
- * Deprecated: 2.2: Use g_main_loop_is_running() instead
- */
-#define g_main_is_running(loop) g_main_loop_is_running(loop)
-
-/**
- * g_main_iteration:
- * @may_block: set to %TRUE if it should block (i.e. wait) until an event
- *     source becomes ready. It will return after an event source has been
- *     processed. If set to %FALSE it will return immediately if no event
- *     source is ready to be processed.
- *
- * Runs a single iteration for the default #GMainContext.
- *
- * Returns: %TRUE if more events are pending.
- *
- * Deprecated: 2.2: Use g_main_context_iteration() instead.
- */
-#define g_main_iteration(may_block) g_main_context_iteration (NULL, may_block)
-
-/**
- * g_main_pending:
- *
- * Checks if any events are pending for the default #GMainContext
- * (i.e. ready to be processed).
- *
- * Returns: %TRUE if any events are pending.
- *
- * Deprected: 2.2: Use g_main_context_pending() instead.
- */
-#define g_main_pending()            g_main_context_pending (NULL)
-
-/**
- * g_main_set_poll_func:
- * @func: the function to call to poll all file descriptors
- *
- * Sets the function to use for the handle polling of file descriptors
- * for the default main context.
- *
- * Deprecated: 2.2: Use g_main_context_set_poll_func() again
- */
-#define g_main_set_poll_func(func)  g_main_context_set_poll_func (NULL, func)
-
-
-G_END_DECLS
-
-#endif /* __G_DEPRECATED_MAIN_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/deprecated/grel.h b/linux-x86/include/glib-2.0/glib/deprecated/grel.h
deleted file mode 100644
index b76e006..0000000
--- a/linux-x86/include/glib-2.0/glib/deprecated/grel.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_REL_H__
-#define __G_REL_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GRelation       GRelation;
-typedef struct _GTuples         GTuples;
-
-struct _GTuples
-{
-  guint len;
-};
-
-/* GRelation
- *
- * Indexed Relations.  Imagine a really simple table in a
- * database.  Relations are not ordered.  This data type is meant for
- * maintaining a N-way mapping.
- *
- * g_relation_new() creates a relation with FIELDS fields
- *
- * g_relation_destroy() frees all resources
- * g_tuples_destroy() frees the result of g_relation_select()
- *
- * g_relation_index() indexes relation FIELD with the provided
- *   equality and hash functions.  this must be done before any
- *   calls to insert are made.
- *
- * g_relation_insert() inserts a new tuple.  you are expected to
- *   provide the right number of fields.
- *
- * g_relation_delete() deletes all relations with KEY in FIELD
- * g_relation_select() returns ...
- * g_relation_count() counts ...
- */
-
-GLIB_DEPRECATED_IN_2_26
-GRelation* g_relation_new     (gint         fields);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_destroy (GRelation   *relation);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_index   (GRelation   *relation,
-                               gint         field,
-                               GHashFunc    hash_func,
-                               GEqualFunc   key_equal_func);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_insert  (GRelation   *relation,
-                               ...);
-GLIB_DEPRECATED_IN_2_26
-gint       g_relation_delete  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GLIB_DEPRECATED_IN_2_26
-GTuples*   g_relation_select  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GLIB_DEPRECATED_IN_2_26
-gint       g_relation_count   (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GLIB_DEPRECATED_IN_2_26
-gboolean   g_relation_exists  (GRelation   *relation,
-                               ...);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_print   (GRelation   *relation);
-GLIB_DEPRECATED_IN_2_26
-void       g_tuples_destroy   (GTuples     *tuples);
-GLIB_DEPRECATED_IN_2_26
-gpointer   g_tuples_index     (GTuples     *tuples,
-                               gint         index_,
-                               gint         field);
-
-G_END_DECLS
-
-#endif /* __G_REL_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/deprecated/gthread.h b/linux-x86/include/glib-2.0/glib/deprecated/gthread.h
deleted file mode 100644
index 462bb8f..0000000
--- a/linux-x86/include/glib-2.0/glib/deprecated/gthread.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_DEPRECATED_THREAD_H__
-#define __G_DEPRECATED_THREAD_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  G_THREAD_PRIORITY_LOW,
-  G_THREAD_PRIORITY_NORMAL,
-  G_THREAD_PRIORITY_HIGH,
-  G_THREAD_PRIORITY_URGENT
-} GThreadPriority;
-
-struct  _GThread
-{
-  /*< private >*/
-  GThreadFunc func;
-  gpointer data;
-  gboolean joinable;
-  GThreadPriority priority;
-};
-
-typedef struct _GThreadFunctions GThreadFunctions;
-struct _GThreadFunctions
-{
-  GMutex*  (*mutex_new)           (void);
-  void     (*mutex_lock)          (GMutex               *mutex);
-  gboolean (*mutex_trylock)       (GMutex               *mutex);
-  void     (*mutex_unlock)        (GMutex               *mutex);
-  void     (*mutex_free)          (GMutex               *mutex);
-  GCond*   (*cond_new)            (void);
-  void     (*cond_signal)         (GCond                *cond);
-  void     (*cond_broadcast)      (GCond                *cond);
-  void     (*cond_wait)           (GCond                *cond,
-                                   GMutex               *mutex);
-  gboolean (*cond_timed_wait)     (GCond                *cond,
-                                   GMutex               *mutex,
-                                   GTimeVal             *end_time);
-  void      (*cond_free)          (GCond                *cond);
-  GPrivate* (*private_new)        (GDestroyNotify        destructor);
-  gpointer  (*private_get)        (GPrivate             *private_key);
-  void      (*private_set)        (GPrivate             *private_key,
-                                   gpointer              data);
-  void      (*thread_create)      (GThreadFunc           func,
-                                   gpointer              data,
-                                   gulong                stack_size,
-                                   gboolean              joinable,
-                                   gboolean              bound,
-                                   GThreadPriority       priority,
-                                   gpointer              thread,
-                                   GError              **error);
-  void      (*thread_yield)       (void);
-  void      (*thread_join)        (gpointer              thread);
-  void      (*thread_exit)        (void);
-  void      (*thread_set_priority)(gpointer              thread,
-                                   GThreadPriority       priority);
-  void      (*thread_self)        (gpointer              thread);
-  gboolean  (*thread_equal)       (gpointer              thread1,
-                                   gpointer              thread2);
-};
-
-GLIB_VAR GThreadFunctions       g_thread_functions_for_glib_use;
-GLIB_VAR gboolean               g_thread_use_default_impl;
-
-GLIB_VAR guint64   (*g_thread_gettime) (void);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_thread_new)
-GThread *g_thread_create       (GThreadFunc       func,
-                                gpointer          data,
-                                gboolean          joinable,
-                                GError          **error);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_thread_new)
-GThread *g_thread_create_full  (GThreadFunc       func,
-                                gpointer          data,
-                                gulong            stack_size,
-                                gboolean          joinable,
-                                gboolean          bound,
-                                GThreadPriority   priority,
-                                GError          **error);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_thread_set_priority (GThread          *thread,
-                                GThreadPriority   priority);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_thread_foreach      (GFunc             thread_func,
-                                gpointer          user_data);
-
-#ifndef G_OS_WIN32
-#include <pthread.h>
-#endif
-
-#define g_static_mutex_get_mutex g_static_mutex_get_mutex_impl
-#define G_STATIC_MUTEX_INIT { NULL }
-typedef struct
-{
-  GMutex *mutex;
-#ifndef G_OS_WIN32
-  /* only for ABI compatibility reasons */
-  pthread_mutex_t unused;
-#endif
-} GStaticMutex;
-
-#define g_static_mutex_lock(mutex) \
-    g_mutex_lock (g_static_mutex_get_mutex (mutex))
-#define g_static_mutex_trylock(mutex) \
-    g_mutex_trylock (g_static_mutex_get_mutex (mutex))
-#define g_static_mutex_unlock(mutex) \
-    g_mutex_unlock (g_static_mutex_get_mutex (mutex))
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_mutex_init)
-void    g_static_mutex_init           (GStaticMutex *mutex);
-GLIB_DEPRECATED_IN_2_32_FOR(g_mutex_clear)
-void    g_static_mutex_free           (GStaticMutex *mutex);
-GLIB_DEPRECATED_IN_2_32_FOR(GMutex)
-GMutex *g_static_mutex_get_mutex_impl (GStaticMutex *mutex);
-
-typedef struct _GStaticRecMutex GStaticRecMutex;
-struct _GStaticRecMutex
-{
-  /*< private >*/
-  GStaticMutex mutex;
-  guint depth;
-
-  /* ABI compat only */
-  union {
-#ifdef G_OS_WIN32
-    void *owner;
-#else
-    pthread_t owner;
-#endif
-    gdouble dummy;
-  } unused;
-};
-
-#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_init)
-void     g_static_rec_mutex_init        (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_lock)
-void     g_static_rec_mutex_lock        (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_try_lock)
-gboolean g_static_rec_mutex_trylock     (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_unlock)
-void     g_static_rec_mutex_unlock      (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_static_rec_mutex_lock_full   (GStaticRecMutex *mutex,
-                                         guint            depth);
-
-GLIB_DEPRECATED_IN_2_32
-guint    g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_free)
-void     g_static_rec_mutex_free        (GStaticRecMutex *mutex);
-
-typedef struct _GStaticRWLock GStaticRWLock;
-struct _GStaticRWLock
-{
-  /*< private >*/
-  GStaticMutex mutex;
-  GCond *read_cond;
-  GCond *write_cond;
-  guint read_counter;
-  gboolean have_writer;
-  guint want_to_read;
-  guint want_to_write;
-};
-
-#define G_STATIC_RW_LOCK_INIT { G_STATIC_MUTEX_INIT, NULL, NULL, 0, FALSE, 0, 0 }
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_init)
-void      g_static_rw_lock_init           (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_lock)
-void      g_static_rw_lock_reader_lock    (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_trylock)
-gboolean  g_static_rw_lock_reader_trylock (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_unlock)
-void      g_static_rw_lock_reader_unlock  (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_lock)
-void      g_static_rw_lock_writer_lock    (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_trylock)
-gboolean  g_static_rw_lock_writer_trylock (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_unlock)
-void      g_static_rw_lock_writer_unlock  (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_free)
-void      g_static_rw_lock_free           (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32
-GPrivate *      g_private_new             (GDestroyNotify notify);
-
-typedef struct _GStaticPrivate  GStaticPrivate;
-struct _GStaticPrivate
-{
-  /*< private >*/
-  guint index;
-};
-
-#define G_STATIC_PRIVATE_INIT { 0 }
-GLIB_DEPRECATED_IN_2_32
-void     g_static_private_init           (GStaticPrivate *private_key);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_private_get)
-gpointer g_static_private_get            (GStaticPrivate *private_key);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_private_set)
-void     g_static_private_set            (GStaticPrivate *private_key,
-                                          gpointer        data,
-                                          GDestroyNotify  notify);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_static_private_free           (GStaticPrivate *private_key);
-
-GLIB_DEPRECATED_IN_2_32
-gboolean g_once_init_enter_impl          (volatile gsize *location);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_thread_init                   (gpointer vtable);
-GLIB_DEPRECATED_IN_2_32
-void    g_thread_init_with_errorcheck_mutexes (gpointer vtable);
-
-GLIB_DEPRECATED_IN_2_32
-gboolean g_thread_get_initialized        (void);
-
-GLIB_VAR gboolean g_threads_got_initialized;
-
-#define g_thread_supported()     (1)
-
-GLIB_DEPRECATED_IN_2_32
-GMutex *        g_mutex_new             (void);
-GLIB_DEPRECATED_IN_2_32
-void            g_mutex_free            (GMutex *mutex);
-GLIB_DEPRECATED_IN_2_32
-GCond *         g_cond_new              (void);
-GLIB_DEPRECATED_IN_2_32
-void            g_cond_free             (GCond  *cond);
-GLIB_DEPRECATED_IN_2_32
-gboolean        g_cond_timed_wait       (GCond          *cond,
-                                         GMutex         *mutex,
-                                         GTimeVal       *timeval);
-
-G_END_DECLS
-
-#endif /* __G_DEPRECATED_THREAD_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/galloca.h b/linux-x86/include/glib-2.0/glib/galloca.h
deleted file mode 100644
index 8ece1b2..0000000
--- a/linux-x86/include/glib-2.0/glib/galloca.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_ALLOCA_H__
-#define __G_ALLOCA_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-#if defined(__BIONIC__) && defined (GLIB_HAVE_ALLOCA_H)
-# include <alloca.h>
-#elif defined(__GNUC__)
-/* GCC does the right thing */
-# undef alloca
-# define alloca(size)   __builtin_alloca (size)
-#elif defined (GLIB_HAVE_ALLOCA_H)
-/* a native and working alloca.h is there */ 
-# include <alloca.h>
-#else /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
-# if defined(_MSC_VER) || defined(__DMC__)
-#  include <malloc.h>
-#  define alloca _alloca
-# else /* !_MSC_VER && !__DMC__ */
-#  ifdef _AIX
-#   pragma alloca
-#  else /* !_AIX */
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-G_BEGIN_DECLS
-char *alloca ();
-G_END_DECLS
-#   endif /* !alloca */
-#  endif /* !_AIX */
-# endif /* !_MSC_VER && !__DMC__ */
-#endif /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
-
-/**
- * g_alloca:
- * @size: number of bytes to allocate.
- * 
- * Allocates @size bytes on the stack; these bytes will be freed when the current
- * stack frame is cleaned up. This macro essentially just wraps the alloca()
- * function present on most UNIX variants.
- * Thus it provides the same advantages and pitfalls as alloca():
- * <variablelist>
- *   <varlistentry><term></term><listitem><para>
- *     + alloca() is very fast, as on most systems it's implemented by just adjusting
- *     the stack pointer register.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     + It doesn't cause any memory fragmentation, within its scope, separate alloca()
- *     blocks just build up and are released together at function end.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Allocation sizes have to fit into the current stack frame. For instance in a
- *       threaded environment on Linux, the per-thread stack size is limited to 2 Megabytes,
- *       so be sparse with alloca() uses.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Allocation failure due to insufficient stack space is not indicated with a %NULL
- *       return like e.g. with malloc(). Instead, most systems probably handle it the same
- *       way as out of stack space situations from infinite function recursion, i.e.
- *       with a segmentation fault.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Special care has to be taken when mixing alloca() with GNU C variable sized arrays.
- *       Stack space allocated with alloca() in the same scope as a variable sized array
- *       will be freed together with the variable sized array upon exit of that scope, and
- *       not upon exit of the enclosing function scope.
- *   </para></listitem></varlistentry>
- * </variablelist>
- * 
- * Returns: space for @size bytes, allocated on the stack
- */
-#define g_alloca(size)		 alloca (size)
-/**
- * g_newa:
- * @struct_type: Type of memory chunks to be allocated
- * @n_structs: Number of chunks to be allocated
- * 
- * Wraps g_alloca() in a more typesafe manner.
- * 
- * Returns: Pointer to stack space for @n_structs chunks of type @struct_type
- */
-#define g_newa(struct_type, n_structs)	((struct_type*) g_alloca (sizeof (struct_type) * (gsize) (n_structs)))
-
-#endif /* __G_ALLOCA_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/garray.h b/linux-x86/include/glib-2.0/glib/garray.h
deleted file mode 100644
index f3d7cee..0000000
--- a/linux-x86/include/glib-2.0/glib/garray.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_ARRAY_H__
-#define __G_ARRAY_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GBytes          GBytes;
-typedef struct _GArray		GArray;
-typedef struct _GByteArray	GByteArray;
-typedef struct _GPtrArray	GPtrArray;
-
-struct _GArray
-{
-  gchar *data;
-  guint len;
-};
-
-struct _GByteArray
-{
-  guint8 *data;
-  guint	  len;
-};
-
-struct _GPtrArray
-{
-  gpointer *pdata;
-  guint	    len;
-};
-
-/* Resizable arrays. remove fills any cleared spot and shortens the
- * array, while preserving the order. remove_fast will distort the
- * order by moving the last element to the position of the removed.
- */
-
-#define g_array_append_val(a,v)	  g_array_append_vals (a, &(v), 1)
-#define g_array_prepend_val(a,v)  g_array_prepend_vals (a, &(v), 1)
-#define g_array_insert_val(a,i,v) g_array_insert_vals (a, i, &(v), 1)
-#define g_array_index(a,t,i)      (((t*) (void *) (a)->data) [(i)])
-
-GLIB_AVAILABLE_IN_ALL
-GArray* g_array_new               (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size);
-GLIB_AVAILABLE_IN_ALL
-GArray* g_array_sized_new         (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size,
-				   guint             reserved_size);
-GLIB_AVAILABLE_IN_ALL
-gchar*  g_array_free              (GArray           *array,
-				   gboolean          free_segment);
-GLIB_AVAILABLE_IN_ALL
-GArray *g_array_ref               (GArray           *array);
-GLIB_AVAILABLE_IN_ALL
-void    g_array_unref             (GArray           *array);
-GLIB_AVAILABLE_IN_ALL
-guint   g_array_get_element_size  (GArray           *array);
-GLIB_AVAILABLE_IN_ALL
-GArray* g_array_append_vals       (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GLIB_AVAILABLE_IN_ALL
-GArray* g_array_prepend_vals      (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GLIB_AVAILABLE_IN_ALL
-GArray* g_array_insert_vals       (GArray           *array,
-				   guint             index_,
-				   gconstpointer     data,
-				   guint             len);
-GLIB_AVAILABLE_IN_ALL
-GArray* g_array_set_size          (GArray           *array,
-				   guint             length);
-GLIB_AVAILABLE_IN_ALL
-GArray* g_array_remove_index      (GArray           *array,
-				   guint             index_);
-GLIB_AVAILABLE_IN_ALL
-GArray* g_array_remove_index_fast (GArray           *array,
-				   guint             index_);
-GLIB_AVAILABLE_IN_ALL
-GArray* g_array_remove_range      (GArray           *array,
-				   guint             index_,
-				   guint             length);
-GLIB_AVAILABLE_IN_ALL
-void    g_array_sort              (GArray           *array,
-				   GCompareFunc      compare_func);
-GLIB_AVAILABLE_IN_ALL
-void    g_array_sort_with_data    (GArray           *array,
-				   GCompareDataFunc  compare_func,
-				   gpointer          user_data);
-GLIB_AVAILABLE_IN_ALL
-void    g_array_set_clear_func    (GArray           *array,
-                                   GDestroyNotify    clear_func);
-
-/* Resizable pointer array.  This interface is much less complicated
- * than the above.  Add appends a pointer.  Remove fills any cleared 
- * spot and shortens the array. remove_fast will again distort order.  
- */
-#define    g_ptr_array_index(array,index_) ((array)->pdata)[index_]
-GLIB_AVAILABLE_IN_ALL
-GPtrArray* g_ptr_array_new                (void);
-GLIB_AVAILABLE_IN_ALL
-GPtrArray* g_ptr_array_new_with_free_func (GDestroyNotify    element_free_func);
-GLIB_AVAILABLE_IN_ALL
-GPtrArray* g_ptr_array_sized_new          (guint             reserved_size);
-GLIB_AVAILABLE_IN_ALL
-GPtrArray* g_ptr_array_new_full           (guint             reserved_size,
-					   GDestroyNotify    element_free_func);
-GLIB_AVAILABLE_IN_ALL
-gpointer*  g_ptr_array_free               (GPtrArray        *array,
-					   gboolean          free_seg);
-GLIB_AVAILABLE_IN_ALL
-GPtrArray* g_ptr_array_ref                (GPtrArray        *array);
-GLIB_AVAILABLE_IN_ALL
-void       g_ptr_array_unref              (GPtrArray        *array);
-GLIB_AVAILABLE_IN_ALL
-void       g_ptr_array_set_free_func      (GPtrArray        *array,
-                                           GDestroyNotify    element_free_func);
-GLIB_AVAILABLE_IN_ALL
-void       g_ptr_array_set_size           (GPtrArray        *array,
-					   gint              length);
-GLIB_AVAILABLE_IN_ALL
-gpointer   g_ptr_array_remove_index       (GPtrArray        *array,
-					   guint             index_);
-GLIB_AVAILABLE_IN_ALL
-gpointer   g_ptr_array_remove_index_fast  (GPtrArray        *array,
-					   guint             index_);
-GLIB_AVAILABLE_IN_ALL
-gboolean   g_ptr_array_remove             (GPtrArray        *array,
-					   gpointer          data);
-GLIB_AVAILABLE_IN_ALL
-gboolean   g_ptr_array_remove_fast        (GPtrArray        *array,
-					   gpointer          data);
-GLIB_AVAILABLE_IN_ALL
-void       g_ptr_array_remove_range       (GPtrArray        *array,
-					   guint             index_,
-					   guint             length);
-GLIB_AVAILABLE_IN_ALL
-void       g_ptr_array_add                (GPtrArray        *array,
-					   gpointer          data);
-GLIB_AVAILABLE_IN_ALL
-void       g_ptr_array_sort               (GPtrArray        *array,
-					   GCompareFunc      compare_func);
-GLIB_AVAILABLE_IN_ALL
-void       g_ptr_array_sort_with_data     (GPtrArray        *array,
-					   GCompareDataFunc  compare_func,
-					   gpointer          user_data);
-GLIB_AVAILABLE_IN_ALL
-void       g_ptr_array_foreach            (GPtrArray        *array,
-					   GFunc             func,
-					   gpointer          user_data);
-
-
-/* Byte arrays, an array of guint8.  Implemented as a GArray,
- * but type-safe.
- */
-
-GLIB_AVAILABLE_IN_ALL
-GByteArray* g_byte_array_new               (void);
-GLIB_AVAILABLE_IN_ALL
-GByteArray* g_byte_array_new_take          (guint8           *data,
-                                            gsize             len);
-GLIB_AVAILABLE_IN_ALL
-GByteArray* g_byte_array_sized_new         (guint             reserved_size);
-GLIB_AVAILABLE_IN_ALL
-guint8*     g_byte_array_free              (GByteArray       *array,
-					    gboolean          free_segment);
-GLIB_AVAILABLE_IN_ALL
-GBytes*     g_byte_array_free_to_bytes     (GByteArray       *array);
-GLIB_AVAILABLE_IN_ALL
-GByteArray *g_byte_array_ref               (GByteArray       *array);
-GLIB_AVAILABLE_IN_ALL
-void        g_byte_array_unref             (GByteArray       *array);
-GLIB_AVAILABLE_IN_ALL
-GByteArray* g_byte_array_append            (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GLIB_AVAILABLE_IN_ALL
-GByteArray* g_byte_array_prepend           (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GLIB_AVAILABLE_IN_ALL
-GByteArray* g_byte_array_set_size          (GByteArray       *array,
-					    guint             length);
-GLIB_AVAILABLE_IN_ALL
-GByteArray* g_byte_array_remove_index      (GByteArray       *array,
-					    guint             index_);
-GLIB_AVAILABLE_IN_ALL
-GByteArray* g_byte_array_remove_index_fast (GByteArray       *array,
-					    guint             index_);
-GLIB_AVAILABLE_IN_ALL
-GByteArray* g_byte_array_remove_range      (GByteArray       *array,
-					    guint             index_,
-					    guint             length);
-GLIB_AVAILABLE_IN_ALL
-void        g_byte_array_sort              (GByteArray       *array,
-					    GCompareFunc      compare_func);
-GLIB_AVAILABLE_IN_ALL
-void        g_byte_array_sort_with_data    (GByteArray       *array,
-					    GCompareDataFunc  compare_func,
-					    gpointer          user_data);
-
-G_END_DECLS
-
-#endif /* __G_ARRAY_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gasyncqueue.h b/linux-x86/include/glib-2.0/glib/gasyncqueue.h
deleted file mode 100644
index 3d4b38f..0000000
--- a/linux-x86/include/glib-2.0/glib/gasyncqueue.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_ASYNCQUEUE_H__
-#define __G_ASYNCQUEUE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAsyncQueue GAsyncQueue;
-
-GLIB_AVAILABLE_IN_ALL
-GAsyncQueue *g_async_queue_new                  (void);
-GLIB_AVAILABLE_IN_ALL
-GAsyncQueue *g_async_queue_new_full             (GDestroyNotify item_free_func);
-GLIB_AVAILABLE_IN_ALL
-void         g_async_queue_lock                 (GAsyncQueue      *queue);
-GLIB_AVAILABLE_IN_ALL
-void         g_async_queue_unlock               (GAsyncQueue      *queue);
-GLIB_AVAILABLE_IN_ALL
-GAsyncQueue *g_async_queue_ref                  (GAsyncQueue      *queue);
-GLIB_AVAILABLE_IN_ALL
-void         g_async_queue_unref                (GAsyncQueue      *queue);
-
-GLIB_DEPRECATED_FOR(g_async_queue_ref)
-void         g_async_queue_ref_unlocked         (GAsyncQueue      *queue);
-
-GLIB_DEPRECATED_FOR(g_async_queue_unref)
-void         g_async_queue_unref_and_unlock     (GAsyncQueue      *queue);
-
-GLIB_AVAILABLE_IN_ALL
-void         g_async_queue_push                 (GAsyncQueue      *queue,
-                                                 gpointer          data);
-GLIB_AVAILABLE_IN_ALL
-void         g_async_queue_push_unlocked        (GAsyncQueue      *queue,
-                                                 gpointer          data);
-GLIB_AVAILABLE_IN_ALL
-void         g_async_queue_push_sorted          (GAsyncQueue      *queue,
-                                                 gpointer          data,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-GLIB_AVAILABLE_IN_ALL
-void         g_async_queue_push_sorted_unlocked (GAsyncQueue      *queue,
-                                                 gpointer          data,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-GLIB_AVAILABLE_IN_ALL
-gpointer     g_async_queue_pop                  (GAsyncQueue      *queue);
-GLIB_AVAILABLE_IN_ALL
-gpointer     g_async_queue_pop_unlocked         (GAsyncQueue      *queue);
-GLIB_AVAILABLE_IN_ALL
-gpointer     g_async_queue_try_pop              (GAsyncQueue      *queue);
-GLIB_AVAILABLE_IN_ALL
-gpointer     g_async_queue_try_pop_unlocked     (GAsyncQueue      *queue);
-GLIB_AVAILABLE_IN_ALL
-gpointer     g_async_queue_timeout_pop          (GAsyncQueue      *queue,
-                                                 guint64           timeout);
-GLIB_AVAILABLE_IN_ALL
-gpointer     g_async_queue_timeout_pop_unlocked (GAsyncQueue      *queue,
-                                                 guint64           timeout);
-GLIB_AVAILABLE_IN_ALL
-gint         g_async_queue_length               (GAsyncQueue      *queue);
-GLIB_AVAILABLE_IN_ALL
-gint         g_async_queue_length_unlocked      (GAsyncQueue      *queue);
-GLIB_AVAILABLE_IN_ALL
-void         g_async_queue_sort                 (GAsyncQueue      *queue,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-GLIB_AVAILABLE_IN_ALL
-void         g_async_queue_sort_unlocked        (GAsyncQueue      *queue,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-
-GLIB_DEPRECATED_FOR(g_async_queue_timeout_pop)
-gpointer     g_async_queue_timed_pop            (GAsyncQueue      *queue,
-                                                 GTimeVal         *end_time);
-GLIB_DEPRECATED_FOR(g_async_queue_timeout_pop_unlocked)
-gpointer     g_async_queue_timed_pop_unlocked   (GAsyncQueue      *queue,
-                                                 GTimeVal         *end_time);
-
-G_END_DECLS
-
-#endif /* __G_ASYNCQUEUE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gatomic.h b/linux-x86/include/glib-2.0/glib/gatomic.h
deleted file mode 100644
index e7fd1f2..0000000
--- a/linux-x86/include/glib-2.0/glib/gatomic.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright © 2011 Ryan Lortie
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_ATOMIC_H__
-#define __G_ATOMIC_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_atomic_int_get                      (const volatile gint *atomic);
-GLIB_AVAILABLE_IN_ALL
-void                    g_atomic_int_set                      (volatile gint  *atomic,
-                                                               gint            newval);
-GLIB_AVAILABLE_IN_ALL
-void                    g_atomic_int_inc                      (volatile gint  *atomic);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_atomic_int_dec_and_test             (volatile gint  *atomic);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_atomic_int_compare_and_exchange     (volatile gint  *atomic,
-                                                               gint            oldval,
-                                                               gint            newval);
-GLIB_AVAILABLE_IN_ALL
-gint                    g_atomic_int_add                      (volatile gint  *atomic,
-                                                               gint            val);
-GLIB_AVAILABLE_IN_2_30
-guint                   g_atomic_int_and                      (volatile guint *atomic,
-                                                               guint           val);
-GLIB_AVAILABLE_IN_2_30
-guint                   g_atomic_int_or                       (volatile guint *atomic,
-                                                               guint           val);
-GLIB_AVAILABLE_IN_ALL
-guint                   g_atomic_int_xor                      (volatile guint *atomic,
-                                                               guint           val);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer                g_atomic_pointer_get                  (const volatile void *atomic);
-GLIB_AVAILABLE_IN_ALL
-void                    g_atomic_pointer_set                  (volatile void  *atomic,
-                                                               gpointer        newval);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_atomic_pointer_compare_and_exchange (volatile void  *atomic,
-                                                               gpointer        oldval,
-                                                               gpointer        newval);
-GLIB_AVAILABLE_IN_ALL
-gssize                  g_atomic_pointer_add                  (volatile void  *atomic,
-                                                               gssize          val);
-GLIB_AVAILABLE_IN_2_30
-gsize                   g_atomic_pointer_and                  (volatile void  *atomic,
-                                                               gsize           val);
-GLIB_AVAILABLE_IN_2_30
-gsize                   g_atomic_pointer_or                   (volatile void  *atomic,
-                                                               gsize           val);
-GLIB_AVAILABLE_IN_ALL
-gsize                   g_atomic_pointer_xor                  (volatile void  *atomic,
-                                                               gsize           val);
-
-GLIB_DEPRECATED_IN_2_30_FOR(g_atomic_add)
-gint                    g_atomic_int_exchange_and_add         (volatile gint  *atomic,
-                                                               gint            val);
-
-G_END_DECLS
-
-#if defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
-
-#define g_atomic_int_get(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ *(atomic) : 0);                                  \
-    __sync_synchronize ();                                                   \
-    (gint) *(atomic);                                                        \
-  }))
-#define g_atomic_int_set(atomic, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (newval) : 0);                                   \
-    *(atomic) = (newval);                                                    \
-    __sync_synchronize ();                                                   \
-  }))
-#define g_atomic_int_inc(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ *(atomic) : 0);                                  \
-    (void) __sync_fetch_and_add ((atomic), 1);                               \
-  }))
-#define g_atomic_int_dec_and_test(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ *(atomic) : 0);                                  \
-    __sync_fetch_and_sub ((atomic), 1) == 1;                                 \
-  }))
-#define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 0);                        \
-    (gboolean) __sync_bool_compare_and_swap ((atomic), (oldval), (newval));  \
-  }))
-#define g_atomic_int_add(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (gint) __sync_fetch_and_add ((atomic), (val));                           \
-  }))
-#define g_atomic_int_and(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (guint) __sync_fetch_and_and ((atomic), (val));                          \
-  }))
-#define g_atomic_int_or(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (guint) __sync_fetch_and_or ((atomic), (val));                           \
-  }))
-#define g_atomic_int_xor(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (guint) __sync_fetch_and_xor ((atomic), (val));                          \
-  }))
-
-#define g_atomic_pointer_get(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    __sync_synchronize ();                                                   \
-    (gpointer) *(atomic);                                                    \
-  }))
-#define g_atomic_pointer_set(atomic, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    *(atomic) = (__typeof__ (*(atomic))) (gsize) (newval);                   \
-    __sync_synchronize ();                                                   \
-  }))
-#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (gboolean) __sync_bool_compare_and_swap ((atomic), (oldval), (newval));  \
-  }))
-#define g_atomic_pointer_add(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gssize) __sync_fetch_and_add ((atomic), (val));                         \
-  }))
-#define g_atomic_pointer_and(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gsize) __sync_fetch_and_and ((atomic), (val));                          \
-  }))
-#define g_atomic_pointer_or(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gsize) __sync_fetch_and_or ((atomic), (val));                           \
-  }))
-#define g_atomic_pointer_xor(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gsize) __sync_fetch_and_xor ((atomic), (val));                          \
-  }))
-
-#else /* defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) */
-
-#define g_atomic_int_get(atomic) \
-  (g_atomic_int_get ((gint *) (atomic)))
-#define g_atomic_int_set(atomic, newval) \
-  (g_atomic_int_set ((gint *) (atomic), (gint) (newval)))
-#define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \
-  (g_atomic_int_compare_and_exchange ((gint *) (atomic), (oldval), (newval)))
-#define g_atomic_int_add(atomic, val) \
-  (g_atomic_int_add ((gint *) (atomic), (val)))
-#define g_atomic_int_and(atomic, val) \
-  (g_atomic_int_and ((guint *) (atomic), (val)))
-#define g_atomic_int_or(atomic, val) \
-  (g_atomic_int_or ((guint *) (atomic), (val)))
-#define g_atomic_int_xor(atomic, val) \
-  (g_atomic_int_xor ((guint *) (atomic), (val)))
-#define g_atomic_int_inc(atomic) \
-  (g_atomic_int_inc ((gint *) (atomic)))
-#define g_atomic_int_dec_and_test(atomic) \
-  (g_atomic_int_dec_and_test ((gint *) (atomic)))
-
-#define g_atomic_pointer_get(atomic) \
-  (g_atomic_pointer_get (atomic))
-#define g_atomic_pointer_set(atomic, newval) \
-  (g_atomic_pointer_set ((atomic), (gpointer) (newval)))
-#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
-  (g_atomic_pointer_compare_and_exchange ((atomic), (gpointer) (oldval), (gpointer) (newval)))
-#define g_atomic_pointer_add(atomic, val) \
-  (g_atomic_pointer_add ((atomic), (gssize) (val)))
-#define g_atomic_pointer_and(atomic, val) \
-  (g_atomic_pointer_and ((atomic), (gsize) (val)))
-#define g_atomic_pointer_or(atomic, val) \
-  (g_atomic_pointer_or ((atomic), (gsize) (val)))
-#define g_atomic_pointer_xor(atomic, val) \
-  (g_atomic_pointer_xor ((atomic), (gsize) (val)))
-
-#endif /* defined(__GNUC__) && defined(G_ATOMIC_OP_USE_GCC_BUILTINS) */
-
-#endif /* __G_ATOMIC_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gbacktrace.h b/linux-x86/include/glib-2.0/glib/gbacktrace.h
deleted file mode 100644
index 47dd2ee..0000000
--- a/linux-x86/include/glib-2.0/glib/gbacktrace.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_BACKTRACE_H__
-#define __G_BACKTRACE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-#include <signal.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-void g_on_error_query (const gchar *prg_name);
-GLIB_AVAILABLE_IN_ALL
-void g_on_error_stack_trace (const gchar *prg_name);
-
-/**
- * G_BREAKPOINT:
- *
- * Inserts a breakpoint instruction into the code.
- *
- * On x86 and alpha systems this is implemented as a soft interrupt
- * and on other architectures it raises a <literal>SIGTRAP</literal> signal.
- */
-#if (defined (__i386__) || defined (__x86_64__)) && defined (__GNUC__) && __GNUC__ >= 2
-#  define G_BREAKPOINT()        G_STMT_START{ __asm__ __volatile__ ("int $03"); }G_STMT_END
-#elif (defined (_MSC_VER) || defined (__DMC__)) && defined (_M_IX86)
-#  define G_BREAKPOINT()        G_STMT_START{ __asm int 3h }G_STMT_END
-#elif defined (_MSC_VER)
-#  define G_BREAKPOINT()        G_STMT_START{ __debugbreak(); }G_STMT_END
-#elif defined (__alpha__) && !defined(__osf__) && defined (__GNUC__) && __GNUC__ >= 2
-#  define G_BREAKPOINT()        G_STMT_START{ __asm__ __volatile__ ("bpt"); }G_STMT_END
-#else   /* !__i386__ && !__alpha__ */
-#  define G_BREAKPOINT()        G_STMT_START{ raise (SIGTRAP); }G_STMT_END
-#endif  /* __i386__ */
-
-G_END_DECLS
-
-#endif /* __G_BACKTRACE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gbase64.h b/linux-x86/include/glib-2.0/glib/gbase64.h
deleted file mode 100644
index b53fca5..0000000
--- a/linux-x86/include/glib-2.0/glib/gbase64.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* gbase64.h - Base64 coding functions
- *
- *  Copyright (C) 2005  Alexander Larsson <alexl@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_BASE64_H__
-#define __G_BASE64_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-gsize   g_base64_encode_step    (const guchar *in,
-                                 gsize         len,
-                                 gboolean      break_lines,
-                                 gchar        *out,
-                                 gint         *state,
-                                 gint         *save);
-GLIB_AVAILABLE_IN_ALL
-gsize   g_base64_encode_close   (gboolean      break_lines,
-                                 gchar        *out,
-                                 gint         *state,
-                                 gint         *save);
-GLIB_AVAILABLE_IN_ALL
-gchar*  g_base64_encode         (const guchar *data,
-                                 gsize         len) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gsize   g_base64_decode_step    (const gchar  *in,
-                                 gsize         len,
-                                 guchar       *out,
-                                 gint         *state,
-                                 guint        *save);
-GLIB_AVAILABLE_IN_ALL
-guchar *g_base64_decode         (const gchar  *text,
-                                 gsize        *out_len) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-guchar *g_base64_decode_inplace (gchar        *text,
-                                 gsize        *out_len);
-
-
-G_END_DECLS
-
-#endif /* __G_BASE64_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gbitlock.h b/linux-x86/include/glib-2.0/glib/gbitlock.h
deleted file mode 100644
index 7485dfa..0000000
--- a/linux-x86/include/glib-2.0/glib/gbitlock.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2008 Ryan Lortie
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_BITLOCK_H__
-#define __G_BITLOCK_H__
-
-#include <glib/gtypes.h>
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-void      g_bit_lock                      (volatile gint *address,
-                                           gint           lock_bit);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_bit_trylock                   (volatile gint *address,
-                                           gint           lock_bit);
-GLIB_AVAILABLE_IN_ALL
-void      g_bit_unlock                    (volatile gint *address,
-                                           gint           lock_bit);
-
-GLIB_AVAILABLE_IN_ALL
-void      g_pointer_bit_lock              (volatile void *address,
-                                           gint           lock_bit);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_pointer_bit_trylock           (volatile void *address,
-                                           gint           lock_bit);
-GLIB_AVAILABLE_IN_ALL
-void      g_pointer_bit_unlock            (volatile void *address,
-                                           gint           lock_bit);
-
-#ifdef __GNUC__
-
-#define g_pointer_bit_lock(address, lock_bit) \
-  (G_GNUC_EXTENSION ({                                                       \
-    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
-    g_pointer_bit_lock ((address), (lock_bit));                              \
-  }))
-
-#define g_pointer_bit_trylock(address, lock_bit) \
-  (G_GNUC_EXTENSION ({                                                       \
-    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
-    g_pointer_bit_trylock ((address), (lock_bit));                           \
-  }))
-
-#define g_pointer_bit_unlock(address, lock_bit) \
-  (G_GNUC_EXTENSION ({                                                       \
-    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
-    g_pointer_bit_unlock ((address), (lock_bit));                            \
-  }))
-
-#endif
-
-G_END_DECLS
-
-#endif /* __G_BITLOCK_H_ */
diff --git a/linux-x86/include/glib-2.0/glib/gbookmarkfile.h b/linux-x86/include/glib-2.0/glib/gbookmarkfile.h
deleted file mode 100644
index 4d94efe..0000000
--- a/linux-x86/include/glib-2.0/glib/gbookmarkfile.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/* gbookmarkfile.h: parsing and building desktop bookmarks
- *
- * Copyright (C) 2005-2006 Emmanuele Bassi
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- */
-
-#ifndef __G_BOOKMARK_FILE_H__
-#define __G_BOOKMARK_FILE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gerror.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_BOOKMARK_FILE_ERROR:
- *
- * Error domain for bookmark file parsing.
- * Errors in this domain will be from the #GBookmarkFileError
- * enumeration. See #GError for information on error domains.
- */
-#define G_BOOKMARK_FILE_ERROR	(g_bookmark_file_error_quark ())
-
-
-/**
- * GBookmarkFileError:
- * @G_BOOKMARK_FILE_ERROR_INVALID_URI: URI was ill-formed
- * @G_BOOKMARK_FILE_ERROR_INVALID_VALUE: a requested field was not found
- * @G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED: a requested application did
- *     not register a bookmark
- * @G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND: a requested URI was not found
- * @G_BOOKMARK_FILE_ERROR_READ: document was ill formed
- * @G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING: the text being parsed was
- *     in an unknown encoding
- * @G_BOOKMARK_FILE_ERROR_WRITE: an error occurred while writing
- * @G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND: requested file was not found
- *
- * Error codes returned by bookmark file parsing.
- */
-typedef enum
-{
-  G_BOOKMARK_FILE_ERROR_INVALID_URI,
-  G_BOOKMARK_FILE_ERROR_INVALID_VALUE,
-  G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED,
-  G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-  G_BOOKMARK_FILE_ERROR_READ,
-  G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING,
-  G_BOOKMARK_FILE_ERROR_WRITE,
-  G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND
-} GBookmarkFileError;
-
-GLIB_AVAILABLE_IN_ALL
-GQuark g_bookmark_file_error_quark (void);
-
-/**
- * GBookmarkFile:
- *
- * The <structname>GBookmarkFile</structname> struct contains only
- * private data and should not be directly accessed.
- */
-typedef struct _GBookmarkFile GBookmarkFile;
-
-GLIB_AVAILABLE_IN_ALL
-GBookmarkFile *g_bookmark_file_new                 (void);
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_free                (GBookmarkFile  *bookmark);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_load_from_file      (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_load_from_data      (GBookmarkFile  *bookmark,
-						    const gchar    *data,
-						    gsize           length,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_load_from_data_dirs (GBookmarkFile  *bookmark,
-						    const gchar    *file,
-						    gchar         **full_path,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-gchar *        g_bookmark_file_to_data             (GBookmarkFile  *bookmark,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_to_file             (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_set_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *title);
-GLIB_AVAILABLE_IN_ALL
-gchar *        g_bookmark_file_get_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_set_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *description);
-GLIB_AVAILABLE_IN_ALL
-gchar *        g_bookmark_file_get_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_set_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *mime_type);
-GLIB_AVAILABLE_IN_ALL
-gchar *        g_bookmark_file_get_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_set_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar   **groups,
-						    gsize           length);
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_add_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_has_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-gchar **       g_bookmark_file_get_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_add_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    const gchar    *exec);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_has_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-gchar **       g_bookmark_file_get_applications    (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_set_app_info        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    const gchar    *exec,
-						    gint            count,
-						    time_t          stamp,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_get_app_info        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    gchar         **exec,
-						    guint          *count,
-						    time_t         *stamp,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_set_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gboolean        is_private);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_get_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_set_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *href,
-						    const gchar    *mime_type);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_get_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gchar         **href,
-						    gchar         **mime_type,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_set_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          added);
-GLIB_AVAILABLE_IN_ALL
-time_t         g_bookmark_file_get_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_set_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          modified);
-GLIB_AVAILABLE_IN_ALL
-time_t         g_bookmark_file_get_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-void           g_bookmark_file_set_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          visited);
-GLIB_AVAILABLE_IN_ALL
-time_t         g_bookmark_file_get_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri, 
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_has_item            (GBookmarkFile  *bookmark,
-						    const gchar    *uri);
-GLIB_AVAILABLE_IN_ALL
-gint           g_bookmark_file_get_size            (GBookmarkFile  *bookmark);
-GLIB_AVAILABLE_IN_ALL
-gchar **       g_bookmark_file_get_uris            (GBookmarkFile  *bookmark,
-						    gsize          *length) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_remove_group        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_remove_application  (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_remove_item         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_bookmark_file_move_item           (GBookmarkFile  *bookmark,
-						    const gchar    *old_uri,
-						    const gchar    *new_uri,
-						    GError        **error);
-
-G_END_DECLS
-
-#endif /* __G_BOOKMARK_FILE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gbytes.h b/linux-x86/include/glib-2.0/glib/gbytes.h
deleted file mode 100644
index c89f6eb..0000000
--- a/linux-x86/include/glib-2.0/glib/gbytes.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright © 2009, 2010 Codethink Limited
- * Copyright © 2011 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- *         Stef Walter <stefw@collabora.co.uk>
- */
-
-#ifndef __G_BYTES_H__
-#define __G_BYTES_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-#include <glib/garray.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-GBytes *        g_bytes_new                     (gconstpointer   data,
-                                                 gsize           size);
-
-GLIB_AVAILABLE_IN_ALL
-GBytes *        g_bytes_new_take                (gpointer        data,
-                                                 gsize           size);
-
-GLIB_AVAILABLE_IN_ALL
-GBytes *        g_bytes_new_static              (gconstpointer   data,
-                                                 gsize           size);
-
-GLIB_AVAILABLE_IN_ALL
-GBytes *        g_bytes_new_with_free_func      (gconstpointer   data,
-                                                 gsize           size,
-                                                 GDestroyNotify  free_func,
-                                                 gpointer        user_data);
-
-GLIB_AVAILABLE_IN_ALL
-GBytes *        g_bytes_new_from_bytes          (GBytes         *bytes,
-                                                 gsize           offset,
-                                                 gsize           length);
-
-GLIB_AVAILABLE_IN_ALL
-gconstpointer   g_bytes_get_data                (GBytes         *bytes,
-                                                 gsize          *size);
-
-GLIB_AVAILABLE_IN_ALL
-gsize           g_bytes_get_size                (GBytes         *bytes);
-
-GLIB_AVAILABLE_IN_ALL
-GBytes *        g_bytes_ref                     (GBytes         *bytes);
-
-GLIB_AVAILABLE_IN_ALL
-void            g_bytes_unref                   (GBytes         *bytes);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer        g_bytes_unref_to_data           (GBytes         *bytes,
-                                                 gsize          *size);
-
-GLIB_AVAILABLE_IN_ALL
-GByteArray *    g_bytes_unref_to_array          (GBytes         *bytes);
-
-GLIB_AVAILABLE_IN_ALL
-guint           g_bytes_hash                    (gconstpointer   bytes);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_bytes_equal                   (gconstpointer   bytes1,
-                                                 gconstpointer   bytes2);
-
-GLIB_AVAILABLE_IN_ALL
-gint            g_bytes_compare                 (gconstpointer   bytes1,
-                                                 gconstpointer   bytes2);
-
-G_END_DECLS
-
-#endif /* __G_BYTES_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gcharset.h b/linux-x86/include/glib-2.0/glib/gcharset.h
deleted file mode 100644
index f3b306d..0000000
--- a/linux-x86/include/glib-2.0/glib/gcharset.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* gcharset.h - Charset functions
- *
- *  Copyright (C) 2011 Red Hat, Inc.
- *
- * The GLib Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The GLib Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_CHARSET_H__
-#define __G_CHARSET_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_get_charset         (const char **charset);
-GLIB_AVAILABLE_IN_ALL
-gchar *               g_get_codeset         (void);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar * const * g_get_language_names  (void);
-GLIB_AVAILABLE_IN_ALL
-gchar **              g_get_locale_variants (const gchar *locale);
-
-G_END_DECLS
-
-#endif  /* __G_CHARSET_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gchecksum.h b/linux-x86/include/glib-2.0/glib/gchecksum.h
deleted file mode 100644
index ba500a2..0000000
--- a/linux-x86/include/glib-2.0/glib/gchecksum.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* gchecksum.h - data hashing functions
- *
- * Copyright (C) 2007  Emmanuele Bassi  <ebassi@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_CHECKSUM_H__
-#define __G_CHECKSUM_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-#include <glib/gbytes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GChecksumType:
- * @G_CHECKSUM_MD5: Use the MD5 hashing algorithm
- * @G_CHECKSUM_SHA1: Use the SHA-1 hashing algorithm
- * @G_CHECKSUM_SHA256: Use the SHA-256 hashing algorithm
- * @G_CHECKSUM_SHA512: Use the SHA-512 hashing algorithm
- *
- * The hashing algorithm to be used by #GChecksum when performing the
- * digest of some data.
- *
- * Note that the #GChecksumType enumeration may be extended at a later
- * date to include new hashing algorithm types.
- *
- * Since: 2.16
- */
-typedef enum {
-  G_CHECKSUM_MD5,
-  G_CHECKSUM_SHA1,
-  G_CHECKSUM_SHA256,
-  G_CHECKSUM_SHA512
-} GChecksumType;
-
-/**
- * GChecksum:
- *
- * An opaque structure representing a checksumming operation.
- * To create a new GChecksum, use g_checksum_new(). To free
- * a GChecksum, use g_checksum_free().
- *
- * Since: 2.16
- */
-typedef struct _GChecksum       GChecksum;
-
-GLIB_AVAILABLE_IN_ALL
-gssize                g_checksum_type_get_length    (GChecksumType    checksum_type);
-
-GLIB_AVAILABLE_IN_ALL
-GChecksum *           g_checksum_new                (GChecksumType    checksum_type);
-GLIB_AVAILABLE_IN_ALL
-void                  g_checksum_reset              (GChecksum       *checksum);
-GLIB_AVAILABLE_IN_ALL
-GChecksum *           g_checksum_copy               (const GChecksum *checksum);
-GLIB_AVAILABLE_IN_ALL
-void                  g_checksum_free               (GChecksum       *checksum);
-GLIB_AVAILABLE_IN_ALL
-void                  g_checksum_update             (GChecksum       *checksum,
-                                                     const guchar    *data,
-                                                     gssize           length);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_checksum_get_string         (GChecksum       *checksum);
-GLIB_AVAILABLE_IN_ALL
-void                  g_checksum_get_digest         (GChecksum       *checksum,
-                                                     guint8          *buffer,
-                                                     gsize           *digest_len);
-
-GLIB_AVAILABLE_IN_ALL
-gchar                *g_compute_checksum_for_data   (GChecksumType    checksum_type,
-                                                     const guchar    *data,
-                                                     gsize            length);
-GLIB_AVAILABLE_IN_ALL
-gchar                *g_compute_checksum_for_string (GChecksumType    checksum_type,
-                                                     const gchar     *str,
-                                                     gssize           length);
-
-GLIB_AVAILABLE_IN_2_34
-gchar                *g_compute_checksum_for_bytes  (GChecksumType    checksum_type,
-                                                     GBytes          *data);
-
-G_END_DECLS
-
-#endif /* __G_CHECKSUM_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gconvert.h b/linux-x86/include/glib-2.0/glib/gconvert.h
deleted file mode 100644
index 1945c07..0000000
--- a/linux-x86/include/glib-2.0/glib/gconvert.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_CONVERT_H__
-#define __G_CONVERT_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-/**
- * GConvertError:
- * @G_CONVERT_ERROR_NO_CONVERSION: Conversion between the requested character
- *     sets is not supported.
- * @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: Invalid byte sequence in conversion input.
- * @G_CONVERT_ERROR_FAILED: Conversion failed for some reason.
- * @G_CONVERT_ERROR_PARTIAL_INPUT: Partial character sequence at end of input.
- * @G_CONVERT_ERROR_BAD_URI: URI is invalid.
- * @G_CONVERT_ERROR_NOT_ABSOLUTE_PATH: Pathname is not an absolute path.
- *
- * Error codes returned by character set conversion routines.
- */
-typedef enum
-{
-  G_CONVERT_ERROR_NO_CONVERSION,
-  G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
-  G_CONVERT_ERROR_FAILED,
-  G_CONVERT_ERROR_PARTIAL_INPUT,
-  G_CONVERT_ERROR_BAD_URI,
-  G_CONVERT_ERROR_NOT_ABSOLUTE_PATH
-} GConvertError;
-
-/**
- * G_CONVERT_ERROR:
- *
- * Error domain for character set conversions. Errors in this domain will
- * be from the #GConvertError enumeration. See #GError for information on
- * error domains.
- */
-#define G_CONVERT_ERROR g_convert_error_quark()
-GLIB_AVAILABLE_IN_ALL
-GQuark g_convert_error_quark (void);
-
-/**
- * GIconv:
- *
- * The <structname>GIConv</structname> struct wraps an
- * iconv() conversion descriptor. It contains private data
- * and should only be accessed using the following functions.
- */
-typedef struct _GIConv *GIConv;
-
-GLIB_AVAILABLE_IN_ALL
-GIConv g_iconv_open   (const gchar  *to_codeset,
-		       const gchar  *from_codeset);
-GLIB_AVAILABLE_IN_ALL
-gsize  g_iconv        (GIConv        converter,
-		       gchar       **inbuf,
-		       gsize        *inbytes_left,
-		       gchar       **outbuf,
-		       gsize        *outbytes_left);
-GLIB_AVAILABLE_IN_ALL
-gint   g_iconv_close  (GIConv        converter);
-
-
-GLIB_AVAILABLE_IN_ALL
-gchar* g_convert               (const gchar  *str,
-				gssize        len,            
-				const gchar  *to_codeset,
-				const gchar  *from_codeset,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar* g_convert_with_iconv    (const gchar  *str,
-				gssize        len,
-				GIConv        converter,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar* g_convert_with_fallback (const gchar  *str,
-				gssize        len,            
-				const gchar  *to_codeset,
-				const gchar  *from_codeset,
-				const gchar  *fallback,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-
-
-/* Convert between libc's idea of strings and UTF-8.
- */
-GLIB_AVAILABLE_IN_ALL
-gchar* g_locale_to_utf8   (const gchar  *opsysstring,
-			   gssize        len,            
-			   gsize        *bytes_read,     
-			   gsize        *bytes_written,  
-			   GError      **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar* g_locale_from_utf8 (const gchar  *utf8string,
-			   gssize        len,            
-			   gsize        *bytes_read,     
-			   gsize        *bytes_written,  
-			   GError      **error) G_GNUC_MALLOC;
-
-/* Convert between the operating system (or C runtime)
- * representation of file names and UTF-8.
- */
-GLIB_AVAILABLE_IN_ALL
-gchar* g_filename_to_utf8   (const gchar  *opsysstring,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar* g_filename_from_utf8 (const gchar  *utf8string,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-
-GLIB_AVAILABLE_IN_ALL
-gchar *g_filename_from_uri (const gchar *uri,
-			    gchar      **hostname,
-			    GError     **error) G_GNUC_MALLOC;
-  
-GLIB_AVAILABLE_IN_ALL
-gchar *g_filename_to_uri   (const gchar *filename,
-			    const gchar *hostname,
-			    GError     **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar *g_filename_display_name (const gchar *filename) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_get_filename_charsets (const gchar ***charsets);
-
-GLIB_AVAILABLE_IN_ALL
-gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC;
-
-GLIB_AVAILABLE_IN_ALL
-gchar **g_uri_list_extract_uris (const gchar *uri_list) G_GNUC_MALLOC;
-
-#ifdef G_OS_WIN32
-#define g_filename_to_utf8   g_filename_to_utf8_utf8
-#define g_filename_from_utf8 g_filename_from_utf8_utf8
-#define g_filename_from_uri  g_filename_from_uri_utf8
-#define g_filename_to_uri    g_filename_to_uri_utf8
-
-GLIB_AVAILABLE_IN_ALL
-gchar* g_filename_to_utf8_utf8   (const gchar  *opsysstring,
-                                  gssize        len,
-                                  gsize        *bytes_read,
-                                  gsize        *bytes_written,
-                                  GError      **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar* g_filename_from_utf8_utf8 (const gchar  *utf8string,
-                                  gssize        len,
-                                  gsize        *bytes_read,
-                                  gsize        *bytes_written,
-                                  GError      **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar *g_filename_from_uri_utf8  (const gchar  *uri,
-                                  gchar       **hostname,
-                                  GError      **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar *g_filename_to_uri_utf8    (const gchar  *filename,
-                                  const gchar  *hostname,
-                                  GError      **error) G_GNUC_MALLOC;
-#endif
-
-G_END_DECLS
-
-#endif /* __G_CONVERT_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gdataset.h b/linux-x86/include/glib-2.0/glib/gdataset.h
deleted file mode 100644
index 6d69e60..0000000
--- a/linux-x86/include/glib-2.0/glib/gdataset.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_DATASET_H__
-#define __G_DATASET_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GData           GData;
-
-typedef void            (*GDataForeachFunc)     (GQuark         key_id,
-                                                 gpointer       data,
-                                                 gpointer       user_data);
-
-/* Keyed Data List
- */
-GLIB_AVAILABLE_IN_ALL
-void     g_datalist_init                (GData            **datalist);
-GLIB_AVAILABLE_IN_ALL
-void     g_datalist_clear               (GData            **datalist);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_datalist_id_get_data         (GData            **datalist,
-					 GQuark             key_id);
-GLIB_AVAILABLE_IN_ALL
-void     g_datalist_id_set_data_full    (GData            **datalist,
-					 GQuark             key_id,
-					 gpointer           data,
-					 GDestroyNotify     destroy_func);
-
-typedef gpointer (*GDuplicateFunc) (gpointer data, gpointer user_data);
-
-GLIB_AVAILABLE_IN_2_34
-gpointer g_datalist_id_dup_data         (GData            **datalist,
-                                         GQuark             key_id,
-                                         GDuplicateFunc     dup_func,
-					 gpointer           user_data);
-GLIB_AVAILABLE_IN_2_34
-gboolean g_datalist_id_replace_data     (GData            **datalist,
-                                         GQuark             key_id,
-                                         gpointer           oldval,
-                                         gpointer           newval,
-                                         GDestroyNotify     destroy,
-					 GDestroyNotify    *old_destroy);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer g_datalist_id_remove_no_notify (GData            **datalist,
-					 GQuark             key_id);
-GLIB_AVAILABLE_IN_ALL
-void     g_datalist_foreach             (GData            **datalist,
-					 GDataForeachFunc   func,
-					 gpointer           user_data);
-
-/**
- * G_DATALIST_FLAGS_MASK:
- *
- * A bitmask that restricts the possible flags passed to
- * g_datalist_set_flags(). Passing a flags value where
- * flags & ~G_DATALIST_FLAGS_MASK != 0 is an error.
- */
-#define G_DATALIST_FLAGS_MASK 0x3
-
-GLIB_AVAILABLE_IN_ALL
-void     g_datalist_set_flags           (GData            **datalist,
-					 guint              flags);
-GLIB_AVAILABLE_IN_ALL
-void     g_datalist_unset_flags         (GData            **datalist,
-					 guint              flags);
-GLIB_AVAILABLE_IN_ALL
-guint    g_datalist_get_flags           (GData            **datalist);
-
-#define   g_datalist_id_set_data(dl, q, d)      \
-     g_datalist_id_set_data_full ((dl), (q), (d), NULL)
-#define   g_datalist_id_remove_data(dl, q)      \
-     g_datalist_id_set_data ((dl), (q), NULL)
-#define   g_datalist_set_data_full(dl, k, d, f) \
-     g_datalist_id_set_data_full ((dl), g_quark_from_string (k), (d), (f))
-#define   g_datalist_remove_no_notify(dl, k)    \
-     g_datalist_id_remove_no_notify ((dl), g_quark_try_string (k))
-#define   g_datalist_set_data(dl, k, d)         \
-     g_datalist_set_data_full ((dl), (k), (d), NULL)
-#define   g_datalist_remove_data(dl, k)         \
-     g_datalist_id_set_data ((dl), g_quark_try_string (k), NULL)
-
-/* Location Associated Keyed Data
- */
-GLIB_AVAILABLE_IN_ALL
-void      g_dataset_destroy             (gconstpointer    dataset_location);
-GLIB_AVAILABLE_IN_ALL
-gpointer  g_dataset_id_get_data         (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-GLIB_AVAILABLE_IN_ALL
-gpointer  g_datalist_get_data            (GData	 **datalist,
-					  const gchar *key);
-GLIB_AVAILABLE_IN_ALL
-void      g_dataset_id_set_data_full    (gconstpointer    dataset_location,
-                                         GQuark           key_id,
-                                         gpointer         data,
-                                         GDestroyNotify   destroy_func);
-GLIB_AVAILABLE_IN_ALL
-gpointer  g_dataset_id_remove_no_notify (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-GLIB_AVAILABLE_IN_ALL
-void      g_dataset_foreach             (gconstpointer    dataset_location,
-                                         GDataForeachFunc func,
-                                         gpointer         user_data);
-#define   g_dataset_id_set_data(l, k, d)        \
-     g_dataset_id_set_data_full ((l), (k), (d), NULL)
-#define   g_dataset_id_remove_data(l, k)        \
-     g_dataset_id_set_data ((l), (k), NULL)
-#define   g_dataset_get_data(l, k)              \
-     (g_dataset_id_get_data ((l), g_quark_try_string (k)))
-#define   g_dataset_set_data_full(l, k, d, f)   \
-     g_dataset_id_set_data_full ((l), g_quark_from_string (k), (d), (f))
-#define   g_dataset_remove_no_notify(l, k)      \
-     g_dataset_id_remove_no_notify ((l), g_quark_try_string (k))
-#define   g_dataset_set_data(l, k, d)           \
-     g_dataset_set_data_full ((l), (k), (d), NULL)
-#define   g_dataset_remove_data(l, k)           \
-     g_dataset_id_set_data ((l), g_quark_try_string (k), NULL)
-
-G_END_DECLS
-
-#endif /* __G_DATASET_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gdate.h b/linux-x86/include/glib-2.0/glib/gdate.h
deleted file mode 100644
index ad02879..0000000
--- a/linux-x86/include/glib-2.0/glib/gdate.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_DATE_H__
-#define __G_DATE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <time.h>
-
-#include <glib/gtypes.h>
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/* GDate
- *
- * Date calculations (not time for now, to be resolved). These are a
- * mutant combination of Steffen Beyer's DateCalc routines
- * (http://www.perl.com/CPAN/authors/id/STBEY/) and Jon Trowbridge's
- * date routines (written for in-house software).  Written by Havoc
- * Pennington <hp@pobox.com>
- */
-
-typedef gint32  GTime;
-typedef guint16 GDateYear;
-typedef guint8  GDateDay;   /* day of the month */
-typedef struct _GDate GDate;
-
-/* enum used to specify order of appearance in parsed date strings */
-typedef enum
-{
-  G_DATE_DAY   = 0,
-  G_DATE_MONTH = 1,
-  G_DATE_YEAR  = 2
-} GDateDMY;
-
-/* actual week and month values */
-typedef enum
-{
-  G_DATE_BAD_WEEKDAY  = 0,
-  G_DATE_MONDAY       = 1,
-  G_DATE_TUESDAY      = 2,
-  G_DATE_WEDNESDAY    = 3,
-  G_DATE_THURSDAY     = 4,
-  G_DATE_FRIDAY       = 5,
-  G_DATE_SATURDAY     = 6,
-  G_DATE_SUNDAY       = 7
-} GDateWeekday;
-typedef enum
-{
-  G_DATE_BAD_MONTH = 0,
-  G_DATE_JANUARY   = 1,
-  G_DATE_FEBRUARY  = 2,
-  G_DATE_MARCH     = 3,
-  G_DATE_APRIL     = 4,
-  G_DATE_MAY       = 5,
-  G_DATE_JUNE      = 6,
-  G_DATE_JULY      = 7,
-  G_DATE_AUGUST    = 8,
-  G_DATE_SEPTEMBER = 9,
-  G_DATE_OCTOBER   = 10,
-  G_DATE_NOVEMBER  = 11,
-  G_DATE_DECEMBER  = 12
-} GDateMonth;
-
-#define G_DATE_BAD_JULIAN 0U
-#define G_DATE_BAD_DAY    0U
-#define G_DATE_BAD_YEAR   0U
-
-/* Note: directly manipulating structs is generally a bad idea, but
- * in this case it's an *incredibly* bad idea, because all or part
- * of this struct can be invalid at any given time. Use the functions,
- * or you will get hosed, I promise.
- */
-struct _GDate
-{
-  guint julian_days : 32; /* julian days representation - we use a
-                           *  bitfield hoping that 64 bit platforms
-                           *  will pack this whole struct in one big
-                           *  int
-                           */
-
-  guint julian : 1;    /* julian is valid */
-  guint dmy    : 1;    /* dmy is valid */
-
-  /* DMY representation */
-  guint day    : 6;
-  guint month  : 4;
-  guint year   : 16;
-};
-
-/* g_date_new() returns an invalid date, you then have to _set() stuff
- * to get a usable object. You can also allocate a GDate statically,
- * then call g_date_clear() to initialize.
- */
-GLIB_AVAILABLE_IN_ALL
-GDate*       g_date_new                   (void);
-GLIB_AVAILABLE_IN_ALL
-GDate*       g_date_new_dmy               (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year);
-GLIB_AVAILABLE_IN_ALL
-GDate*       g_date_new_julian            (guint32      julian_day);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_free                  (GDate       *date);
-
-/* check g_date_valid() after doing an operation that might fail, like
- * _parse.  Almost all g_date operations are undefined on invalid
- * dates (the exceptions are the mutators, since you need those to
- * return to validity).
- */
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_date_valid                 (const GDate *date);
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_date_valid_day             (GDateDay     day) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_date_valid_month           (GDateMonth month) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_date_valid_year            (GDateYear  year) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_date_valid_weekday         (GDateWeekday weekday) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_date_valid_julian          (guint32 julian_date) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_date_valid_dmy             (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GDateWeekday g_date_get_weekday           (const GDate *date);
-GLIB_AVAILABLE_IN_ALL
-GDateMonth   g_date_get_month             (const GDate *date);
-GLIB_AVAILABLE_IN_ALL
-GDateYear    g_date_get_year              (const GDate *date);
-GLIB_AVAILABLE_IN_ALL
-GDateDay     g_date_get_day               (const GDate *date);
-GLIB_AVAILABLE_IN_ALL
-guint32      g_date_get_julian            (const GDate *date);
-GLIB_AVAILABLE_IN_ALL
-guint        g_date_get_day_of_year       (const GDate *date);
-/* First monday/sunday is the start of week 1; if we haven't reached
- * that day, return 0. These are not ISO weeks of the year; that
- * routine needs to be added.
- * these functions return the number of weeks, starting on the
- * corrsponding day
- */
-GLIB_AVAILABLE_IN_ALL
-guint        g_date_get_monday_week_of_year (const GDate *date);
-GLIB_AVAILABLE_IN_ALL
-guint        g_date_get_sunday_week_of_year (const GDate *date);
-GLIB_AVAILABLE_IN_ALL
-guint        g_date_get_iso8601_week_of_year (const GDate *date);
-
-/* If you create a static date struct you need to clear it to get it
- * in a sane state before use. You can clear a whole array at
- * once with the ndates argument.
- */
-GLIB_AVAILABLE_IN_ALL
-void         g_date_clear                 (GDate       *date,
-                                           guint        n_dates);
-
-/* The parse routine is meant for dates typed in by a user, so it
- * permits many formats but tries to catch common typos. If your data
- * needs to be strictly validated, it is not an appropriate function.
- */
-GLIB_AVAILABLE_IN_ALL
-void         g_date_set_parse             (GDate       *date,
-                                           const gchar *str);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_set_time_t            (GDate       *date,
-					   time_t       timet);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_set_time_val          (GDate       *date,
-					   GTimeVal    *timeval);
-#ifndef G_DISABLE_DEPRECATED
-GLIB_DEPRECATED_FOR(g_date_set_time_t)
-void         g_date_set_time              (GDate       *date,
-                                           GTime        time_);
-#endif
-GLIB_AVAILABLE_IN_ALL
-void         g_date_set_month             (GDate       *date,
-                                           GDateMonth   month);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_set_day               (GDate       *date,
-                                           GDateDay     day);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_set_year              (GDate       *date,
-                                           GDateYear    year);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_set_dmy               (GDate       *date,
-                                           GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    y);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_set_julian            (GDate       *date,
-                                           guint32      julian_date);
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_date_is_first_of_month     (const GDate *date);
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_date_is_last_of_month      (const GDate *date);
-
-/* To go forward by some number of weeks just go forward weeks*7 days */
-GLIB_AVAILABLE_IN_ALL
-void         g_date_add_days              (GDate       *date,
-                                           guint        n_days);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_subtract_days         (GDate       *date,
-                                           guint        n_days);
-
-/* If you add/sub months while day > 28, the day might change */
-GLIB_AVAILABLE_IN_ALL
-void         g_date_add_months            (GDate       *date,
-                                           guint        n_months);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_subtract_months       (GDate       *date,
-                                           guint        n_months);
-
-/* If it's feb 29, changing years can move you to the 28th */
-GLIB_AVAILABLE_IN_ALL
-void         g_date_add_years             (GDate       *date,
-                                           guint        n_years);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_subtract_years        (GDate       *date,
-                                           guint        n_years);
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_date_is_leap_year          (GDateYear    year) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-guint8       g_date_get_days_in_month     (GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-guint8       g_date_get_monday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-guint8       g_date_get_sunday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-
-/* Returns the number of days between the two dates.  If date2 comes
-   before date1, a negative value is return. */
-GLIB_AVAILABLE_IN_ALL
-gint         g_date_days_between          (const GDate *date1,
-					   const GDate *date2);
-
-/* qsort-friendly (with a cast...) */
-GLIB_AVAILABLE_IN_ALL
-gint         g_date_compare               (const GDate *lhs,
-                                           const GDate *rhs);
-GLIB_AVAILABLE_IN_ALL
-void         g_date_to_struct_tm          (const GDate *date,
-                                           struct tm   *tm);
-
-GLIB_AVAILABLE_IN_ALL
-void         g_date_clamp                 (GDate *date,
-					   const GDate *min_date,
-					   const GDate *max_date);
-
-/* Swap date1 and date2's values if date1 > date2. */
-GLIB_AVAILABLE_IN_ALL
-void         g_date_order                 (GDate *date1, GDate *date2);
-
-/* Just like strftime() except you can only use date-related formats.
- *   Using a time format is undefined.
- */
-GLIB_AVAILABLE_IN_ALL
-gsize        g_date_strftime              (gchar       *s,
-                                           gsize        slen,
-                                           const gchar *format,
-                                           const GDate *date);
-
-#ifndef G_DISABLE_DEPRECATED
-
-#define g_date_weekday 			g_date_get_weekday
-#define g_date_month 			g_date_get_month
-#define g_date_year 			g_date_get_year
-#define g_date_day 			g_date_get_day
-#define g_date_julian 			g_date_get_julian
-#define g_date_day_of_year 		g_date_get_day_of_year
-#define g_date_monday_week_of_year 	g_date_get_monday_week_of_year
-#define g_date_sunday_week_of_year 	g_date_get_sunday_week_of_year
-#define g_date_days_in_month 		g_date_get_days_in_month
-#define g_date_monday_weeks_in_year 	g_date_get_monday_weeks_in_year
-#define g_date_sunday_weeks_in_year	g_date_get_sunday_weeks_in_year
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_DATE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gdatetime.h b/linux-x86/include/glib-2.0/glib/gdatetime.h
deleted file mode 100644
index cbaf190..0000000
--- a/linux-x86/include/glib-2.0/glib/gdatetime.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (C) 2009-2010 Christian Hergert <chris@dronelabs.com>
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * licence, or (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA.
- *
- * Authors: Christian Hergert <chris@dronelabs.com>
- *          Thiago Santos <thiago.sousa.santos@collabora.co.uk>
- *          Emmanuele Bassi <ebassi@linux.intel.com>
- *          Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_DATE_TIME_H__
-#define __G_DATE_TIME_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtimezone.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TIME_SPAN_DAY:
- *
- * Evaluates to a time span of one day.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_DAY                 (G_GINT64_CONSTANT (86400000000))
-
-/**
- * G_TIME_SPAN_HOUR:
- *
- * Evaluates to a time span of one hour.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_HOUR                (G_GINT64_CONSTANT (3600000000))
-
-/**
- * G_TIME_SPAN_MINUTE:
- *
- * Evaluates to a time span of one minute.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_MINUTE              (G_GINT64_CONSTANT (60000000))
-
-/**
- * G_TIME_SPAN_SECOND:
- *
- * Evaluates to a time span of one second.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_SECOND              (G_GINT64_CONSTANT (1000000))
-
-/**
- * G_TIME_SPAN_MILLISECOND:
- *
- * Evaluates to a time span of one millisecond.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_MILLISECOND         (G_GINT64_CONSTANT (1000))
-
-/**
- * GTimeSpan:
- *
- * A value representing an interval of time, in microseconds.
- *
- * Since: 2.26
- */
-typedef gint64 GTimeSpan;
-
-/**
- * GDateTime:
- *
- * <structname>GDateTime</structname> is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.26
- */
-typedef struct _GDateTime GDateTime;
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_date_time_unref                               (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_ref                                 (GDateTime      *datetime);
-
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_new_now                             (GTimeZone      *tz);
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_new_now_local                       (void);
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_new_now_utc                         (void);
-
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_new_from_unix_local                 (gint64          t);
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_new_from_unix_utc                   (gint64          t);
-
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_new_from_timeval_local              (const GTimeVal *tv);
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_new_from_timeval_utc                (const GTimeVal *tv);
-
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_new                                 (GTimeZone      *tz,
-                                                                         gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_new_local                           (gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_new_utc                             (gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-
-GLIB_AVAILABLE_IN_ALL
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add                                 (GDateTime      *datetime,
-                                                                         GTimeSpan       timespan);
-
-GLIB_AVAILABLE_IN_ALL
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_years                           (GDateTime      *datetime,
-                                                                         gint            years);
-GLIB_AVAILABLE_IN_ALL
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_months                          (GDateTime      *datetime,
-                                                                         gint            months);
-GLIB_AVAILABLE_IN_ALL
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_weeks                           (GDateTime      *datetime,
-                                                                         gint            weeks);
-GLIB_AVAILABLE_IN_ALL
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_days                            (GDateTime      *datetime,
-                                                                         gint            days);
-
-GLIB_AVAILABLE_IN_ALL
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_hours                           (GDateTime      *datetime,
-                                                                         gint            hours);
-GLIB_AVAILABLE_IN_ALL
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_minutes                         (GDateTime      *datetime,
-                                                                         gint            minutes);
-GLIB_AVAILABLE_IN_ALL
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_seconds                         (GDateTime      *datetime,
-                                                                         gdouble         seconds);
-
-GLIB_AVAILABLE_IN_ALL
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_full                            (GDateTime      *datetime,
-                                                                         gint            years,
-                                                                         gint            months,
-                                                                         gint            days,
-                                                                         gint            hours,
-                                                                         gint            minutes,
-                                                                         gdouble         seconds);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_compare                             (gconstpointer   dt1,
-                                                                         gconstpointer   dt2);
-GLIB_AVAILABLE_IN_ALL
-GTimeSpan               g_date_time_difference                          (GDateTime      *end,
-                                                                         GDateTime      *begin);
-GLIB_AVAILABLE_IN_ALL
-guint                   g_date_time_hash                                (gconstpointer   datetime);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_date_time_equal                               (gconstpointer   dt1,
-                                                                         gconstpointer   dt2);
-
-GLIB_AVAILABLE_IN_ALL
-void                    g_date_time_get_ymd                             (GDateTime      *datetime,
-                                                                         gint           *year,
-                                                                         gint           *month,
-                                                                         gint           *day);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_year                            (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_month                           (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_day_of_month                    (GDateTime      *datetime);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_week_numbering_year             (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_week_of_year                    (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_day_of_week                     (GDateTime      *datetime);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_day_of_year                     (GDateTime      *datetime);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_hour                            (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_minute                          (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_second                          (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-gint                    g_date_time_get_microsecond                     (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-gdouble                 g_date_time_get_seconds                         (GDateTime      *datetime);
-
-GLIB_AVAILABLE_IN_ALL
-gint64                  g_date_time_to_unix                             (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_date_time_to_timeval                          (GDateTime      *datetime,
-                                                                         GTimeVal       *tv);
-
-GLIB_AVAILABLE_IN_ALL
-GTimeSpan               g_date_time_get_utc_offset                      (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-const gchar *           g_date_time_get_timezone_abbreviation           (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_date_time_is_daylight_savings                 (GDateTime      *datetime);
-
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_to_timezone                         (GDateTime      *datetime,
-                                                                         GTimeZone      *tz);
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_to_local                            (GDateTime      *datetime);
-GLIB_AVAILABLE_IN_ALL
-GDateTime *             g_date_time_to_utc                              (GDateTime      *datetime);
-
-GLIB_AVAILABLE_IN_ALL
-gchar *                 g_date_time_format                              (GDateTime      *datetime,
-                                                                         const gchar    *format) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_DATE_TIME_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gdir.h b/linux-x86/include/glib-2.0/glib/gdir.h
deleted file mode 100644
index 7b6ec1b..0000000
--- a/linux-x86/include/glib-2.0/glib/gdir.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * gdir.c: Simplified wrapper around the DIRENT functions.
- *
- * Copyright 2001 Hans Breuer
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_DIR_H__
-#define __G_DIR_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gerror.h>
-
-#ifdef G_OS_UNIX
-#include <dirent.h>
-#endif
-
-G_BEGIN_DECLS
-
-typedef struct _GDir GDir;
-
-GLIB_AVAILABLE_IN_ALL
-GDir    *                g_dir_open           (const gchar  *path,
-					       guint         flags,
-					       GError      **error);
-GLIB_AVAILABLE_IN_ALL
-const gchar *            g_dir_read_name      (GDir         *dir);
-GLIB_AVAILABLE_IN_ALL
-void                     g_dir_rewind         (GDir         *dir);
-GLIB_AVAILABLE_IN_ALL
-void                     g_dir_close          (GDir         *dir);
-
-#ifdef G_OS_WIN32
-#define g_dir_open      g_dir_open_utf8
-#define g_dir_read_name g_dir_read_name_utf8
-
-GLIB_AVAILABLE_IN_ALL
-GDir        *g_dir_open_utf8      (const gchar  *path,
-                                   guint         flags,
-                                   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_dir_read_name_utf8 (GDir         *dir);
-#endif /* G_OS_WIN32 */
-
-G_END_DECLS
-
-#endif /* __G_DIR_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/genviron.h b/linux-x86/include/glib-2.0/glib/genviron.h
deleted file mode 100644
index 1fcc225..0000000
--- a/linux-x86/include/glib-2.0/glib/genviron.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_ENVIRON_H__
-#define __G_ENVIRON_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-const gchar * g_getenv           (const gchar  *variable);
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_setenv           (const gchar  *variable,
-                                  const gchar  *value,
-                                  gboolean      overwrite);
-GLIB_AVAILABLE_IN_ALL
-void          g_unsetenv         (const gchar  *variable);
-GLIB_AVAILABLE_IN_ALL
-gchar **      g_listenv          (void);
-
-GLIB_AVAILABLE_IN_ALL
-gchar **      g_get_environ      (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar * g_environ_getenv   (gchar       **envp,
-                                  const gchar  *variable);
-GLIB_AVAILABLE_IN_ALL
-gchar **      g_environ_setenv   (gchar       **envp,
-                                  const gchar  *variable,
-                                  const gchar  *value,
-                                  gboolean      overwrite) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-gchar **      g_environ_unsetenv (gchar       **envp,
-                                  const gchar  *variable) G_GNUC_WARN_UNUSED_RESULT;
-
-#ifdef G_OS_WIN32
-#define g_getenv   g_getenv_utf8
-#define g_setenv   g_setenv_utf8
-#define g_unsetenv g_unsetenv_utf8
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_getenv_utf8   (const gchar  *variable);
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_setenv_utf8   (const gchar  *variable,
-                              const gchar  *value,
-                              gboolean      overwrite);
-GLIB_AVAILABLE_IN_ALL
-void         g_unsetenv_utf8 (const gchar  *variable);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_ENVIRON_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gerror.h b/linux-x86/include/glib-2.0/glib/gerror.h
deleted file mode 100644
index 6224b87..0000000
--- a/linux-x86/include/glib-2.0/glib/gerror.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* gerror.h - Error reporting system
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_ERROR_H__
-#define __G_ERROR_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <stdarg.h>
-
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/**
- * GError:
- * @domain: error domain, e.g. #G_FILE_ERROR
- * @code: error code, e.g. %G_FILE_ERROR_NOENT
- * @message: human-readable informative error message
- *
- * The <structname>GError</structname> structure contains
- * information about an error that has occurred.
- */
-typedef struct _GError GError;
-
-struct _GError
-{
-  GQuark       domain;
-  gint         code;
-  gchar       *message;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GError*  g_error_new           (GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (3, 4);
-
-GLIB_AVAILABLE_IN_ALL
-GError*  g_error_new_literal   (GQuark         domain,
-                                gint           code,
-                                const gchar   *message);
-GLIB_AVAILABLE_IN_ALL
-GError*  g_error_new_valist    (GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                va_list        args) G_GNUC_PRINTF(3, 0);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_error_free          (GError        *error);
-GLIB_AVAILABLE_IN_ALL
-GError*  g_error_copy          (const GError  *error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_error_matches       (const GError  *error,
-                                GQuark         domain,
-                                gint           code);
-
-/* if (err) *err = g_error_new(domain, code, format, ...), also has
- * some sanity checks.
- */
-GLIB_AVAILABLE_IN_ALL
-void     g_set_error           (GError       **err,
-                                GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (4, 5);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_set_error_literal   (GError       **err,
-                                GQuark         domain,
-                                gint           code,
-                                const gchar   *message);
-
-/* if (dest) *dest = src; also has some sanity checks.
- */
-GLIB_AVAILABLE_IN_ALL
-void     g_propagate_error     (GError       **dest,
-				GError        *src);
-
-/* if (err && *err) { g_error_free(*err); *err = NULL; } */
-GLIB_AVAILABLE_IN_ALL
-void     g_clear_error         (GError       **err);
-
-/* if (err) prefix the formatted string to the ->message */
-GLIB_AVAILABLE_IN_ALL
-void     g_prefix_error               (GError       **err,
-                                       const gchar   *format,
-                                       ...) G_GNUC_PRINTF (2, 3);
-
-/* g_propagate_error then g_error_prefix on dest */
-GLIB_AVAILABLE_IN_ALL
-void     g_propagate_prefixed_error   (GError       **dest,
-                                       GError        *src,
-                                       const gchar   *format,
-                                       ...) G_GNUC_PRINTF (3, 4);
-
-G_END_DECLS
-
-#endif /* __G_ERROR_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gfileutils.h b/linux-x86/include/glib-2.0/glib/gfileutils.h
deleted file mode 100644
index 93dbde3..0000000
--- a/linux-x86/include/glib-2.0/glib/gfileutils.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* gfileutils.h - File utility functions
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_FILEUTILS_H__
-#define __G_FILEUTILS_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_FILE_ERROR g_file_error_quark ()
-
-typedef enum
-{
-  G_FILE_ERROR_EXIST,
-  G_FILE_ERROR_ISDIR,
-  G_FILE_ERROR_ACCES,
-  G_FILE_ERROR_NAMETOOLONG,
-  G_FILE_ERROR_NOENT,
-  G_FILE_ERROR_NOTDIR,
-  G_FILE_ERROR_NXIO,
-  G_FILE_ERROR_NODEV,
-  G_FILE_ERROR_ROFS,
-  G_FILE_ERROR_TXTBSY,
-  G_FILE_ERROR_FAULT,
-  G_FILE_ERROR_LOOP,
-  G_FILE_ERROR_NOSPC,
-  G_FILE_ERROR_NOMEM,
-  G_FILE_ERROR_MFILE,
-  G_FILE_ERROR_NFILE,
-  G_FILE_ERROR_BADF,
-  G_FILE_ERROR_INVAL,
-  G_FILE_ERROR_PIPE,
-  G_FILE_ERROR_AGAIN,
-  G_FILE_ERROR_INTR,
-  G_FILE_ERROR_IO,
-  G_FILE_ERROR_PERM,
-  G_FILE_ERROR_NOSYS,
-  G_FILE_ERROR_FAILED
-} GFileError;
-
-/* For backward-compat reasons, these are synced to an old
- * anonymous enum in libgnome. But don't use that enum
- * in new code.
- */
-typedef enum
-{
-  G_FILE_TEST_IS_REGULAR    = 1 << 0,
-  G_FILE_TEST_IS_SYMLINK    = 1 << 1,
-  G_FILE_TEST_IS_DIR        = 1 << 2,
-  G_FILE_TEST_IS_EXECUTABLE = 1 << 3,
-  G_FILE_TEST_EXISTS        = 1 << 4
-} GFileTest;
-
-GLIB_AVAILABLE_IN_ALL
-GQuark     g_file_error_quark      (void);
-/* So other code can generate a GFileError */
-GLIB_AVAILABLE_IN_ALL
-GFileError g_file_error_from_errno (gint err_no);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_test         (const gchar  *filename,
-                              GFileTest     test);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_get_contents (const gchar  *filename,
-                              gchar       **contents,
-                              gsize        *length,
-                              GError      **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_set_contents (const gchar *filename,
-                              const gchar *contents,
-                              gssize         length,
-                              GError       **error);
-GLIB_AVAILABLE_IN_ALL
-gchar   *g_file_read_link    (const gchar  *filename,
-                              GError      **error);
-
-/* Wrapper / workalike for mkdtemp() */
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_mkdtemp            (gchar        *tmpl);
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_mkdtemp_full       (gchar        *tmpl,
-                               gint          mode);
-
-/* Wrapper / workalike for mkstemp() */
-GLIB_AVAILABLE_IN_ALL
-gint     g_mkstemp            (gchar        *tmpl);
-GLIB_AVAILABLE_IN_ALL
-gint     g_mkstemp_full       (gchar        *tmpl,
-                               gint          flags,
-                               gint          mode);
-
-/* Wrappers for g_mkstemp and g_mkdtemp() */
-GLIB_AVAILABLE_IN_ALL
-gint     g_file_open_tmp      (const gchar  *tmpl,
-                               gchar       **name_used,
-                               GError      **error);
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_dir_make_tmp       (const gchar  *tmpl,
-                               GError      **error);
-
-GLIB_AVAILABLE_IN_ALL
-gchar   *g_build_path         (const gchar *separator,
-                               const gchar *first_element,
-                               ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
-gchar   *g_build_pathv        (const gchar  *separator,
-                               gchar       **args) G_GNUC_MALLOC;
-
-GLIB_AVAILABLE_IN_ALL
-gchar   *g_build_filename     (const gchar *first_element,
-                               ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
-gchar   *g_build_filenamev    (gchar      **args) G_GNUC_MALLOC;
-
-GLIB_AVAILABLE_IN_ALL
-gint     g_mkdir_with_parents (const gchar *pathname,
-                               gint         mode);
-
-#ifdef G_OS_WIN32
-
-/* On Win32, the canonical directory separator is the backslash, and
- * the search path separator is the semicolon. Note that also the
- * (forward) slash works as directory separator.
- */
-#define G_DIR_SEPARATOR '\\'
-#define G_DIR_SEPARATOR_S "\\"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
-#define G_SEARCHPATH_SEPARATOR ';'
-#define G_SEARCHPATH_SEPARATOR_S ";"
-
-#else  /* !G_OS_WIN32 */
-
-#define G_DIR_SEPARATOR '/'
-#define G_DIR_SEPARATOR_S "/"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
-#define G_SEARCHPATH_SEPARATOR ':'
-#define G_SEARCHPATH_SEPARATOR_S ":"
-
-#endif /* !G_OS_WIN32 */
-
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_path_is_absolute (const gchar *file_name);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_path_skip_root   (const gchar *file_name);
-
-GLIB_DEPRECATED_FOR(g_path_get_basename)
-const gchar *g_basename         (const gchar *file_name);
-#ifndef G_DISABLE_DEPRECATED
-#define g_dirname g_path_get_dirname
-#endif
-
-GLIB_AVAILABLE_IN_ALL
-gchar *g_get_current_dir   (void);
-GLIB_AVAILABLE_IN_ALL
-gchar *g_path_get_basename (const gchar *file_name) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar *g_path_get_dirname  (const gchar *file_name) G_GNUC_MALLOC;
-
-#ifdef G_OS_WIN32
-#define g_file_test         g_file_test_utf8
-#define g_file_get_contents g_file_get_contents_utf8
-#define g_mkstemp           g_mkstemp_utf8
-#define g_file_open_tmp     g_file_open_tmp_utf8
-#define g_get_current_dir   g_get_current_dir_utf8
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_test_utf8         (const gchar  *filename,
-                                   GFileTest     test);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_file_get_contents_utf8 (const gchar  *filename,
-                                   gchar       **contents,
-                                   gsize        *length,
-                                   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-gint     g_mkstemp_utf8           (gchar        *tmpl);
-GLIB_AVAILABLE_IN_ALL
-gint     g_file_open_tmp_utf8     (const gchar  *tmpl,
-                                   gchar       **name_used,
-                                   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-gchar   *g_get_current_dir_utf8   (void);
-#endif /* G_OS_WIN32 */
-
-G_END_DECLS
-
-#endif /* __G_FILEUTILS_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/ggettext.h b/linux-x86/include/glib-2.0/glib/ggettext.h
deleted file mode 100644
index e1ef576..0000000
--- a/linux-x86/include/glib-2.0/glib/ggettext.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_GETTEXT_H__
-#define __G_GETTEXT_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_strip_context (const gchar *msgid,
-                              const gchar *msgval) G_GNUC_FORMAT(1);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_dgettext      (const gchar *domain,
-                              const gchar *msgid) G_GNUC_FORMAT(2);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_dcgettext     (const gchar *domain,
-                              const gchar *msgid,
-                              gint         category) G_GNUC_FORMAT(2);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_dngettext     (const gchar *domain,
-                              const gchar *msgid,
-                              const gchar *msgid_plural,
-                              gulong       n) G_GNUC_FORMAT(3);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_dpgettext     (const gchar *domain,
-                              const gchar *msgctxtid,
-                              gsize        msgidoffset) G_GNUC_FORMAT(2);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_dpgettext2    (const gchar *domain,
-                              const gchar *context,
-                              const gchar *msgid) G_GNUC_FORMAT(3);
-
-G_END_DECLS
-
-#endif /* __G_GETTEXT_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/ghash.h b/linux-x86/include/glib-2.0/glib/ghash.h
deleted file mode 100644
index 19054bb..0000000
--- a/linux-x86/include/glib-2.0/glib/ghash.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_HASH_H__
-#define __G_HASH_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GHashTable  GHashTable;
-
-typedef gboolean  (*GHRFunc)  (gpointer  key,
-                               gpointer  value,
-                               gpointer  user_data);
-
-typedef struct _GHashTableIter GHashTableIter;
-
-struct _GHashTableIter
-{
-  /*< private >*/
-  gpointer      dummy1;
-  gpointer      dummy2;
-  gpointer      dummy3;
-  int           dummy4;
-  gboolean      dummy5;
-  gpointer      dummy6;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GHashTable* g_hash_table_new               (GHashFunc       hash_func,
-                                            GEqualFunc      key_equal_func);
-GLIB_AVAILABLE_IN_ALL
-GHashTable* g_hash_table_new_full          (GHashFunc       hash_func,
-                                            GEqualFunc      key_equal_func,
-                                            GDestroyNotify  key_destroy_func,
-                                            GDestroyNotify  value_destroy_func);
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_destroy           (GHashTable     *hash_table);
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_insert            (GHashTable     *hash_table,
-                                            gpointer        key,
-                                            gpointer        value);
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_replace           (GHashTable     *hash_table,
-                                            gpointer        key,
-                                            gpointer        value);
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_add               (GHashTable     *hash_table,
-                                            gpointer        key);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_hash_table_remove            (GHashTable     *hash_table,
-                                            gconstpointer   key);
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_remove_all        (GHashTable     *hash_table);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_hash_table_steal             (GHashTable     *hash_table,
-                                            gconstpointer   key);
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_steal_all         (GHashTable     *hash_table);
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_hash_table_lookup            (GHashTable     *hash_table,
-                                            gconstpointer   key);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_hash_table_contains          (GHashTable     *hash_table,
-                                            gconstpointer   key);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_hash_table_lookup_extended   (GHashTable     *hash_table,
-                                            gconstpointer   lookup_key,
-                                            gpointer       *orig_key,
-                                            gpointer       *value);
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_foreach           (GHashTable     *hash_table,
-                                            GHFunc          func,
-                                            gpointer        user_data);
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_hash_table_find              (GHashTable     *hash_table,
-                                            GHRFunc         predicate,
-                                            gpointer        user_data);
-GLIB_AVAILABLE_IN_ALL
-guint       g_hash_table_foreach_remove    (GHashTable     *hash_table,
-                                            GHRFunc         func,
-                                            gpointer        user_data);
-GLIB_AVAILABLE_IN_ALL
-guint       g_hash_table_foreach_steal     (GHashTable     *hash_table,
-                                            GHRFunc         func,
-                                            gpointer        user_data);
-GLIB_AVAILABLE_IN_ALL
-guint       g_hash_table_size              (GHashTable     *hash_table);
-GLIB_AVAILABLE_IN_ALL
-GList *     g_hash_table_get_keys          (GHashTable     *hash_table);
-GLIB_AVAILABLE_IN_ALL
-GList *     g_hash_table_get_values        (GHashTable     *hash_table);
-
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_iter_init         (GHashTableIter *iter,
-                                            GHashTable     *hash_table);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_hash_table_iter_next         (GHashTableIter *iter,
-                                            gpointer       *key,
-                                            gpointer       *value);
-GLIB_AVAILABLE_IN_ALL
-GHashTable* g_hash_table_iter_get_hash_table (GHashTableIter *iter);
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_iter_remove       (GHashTableIter *iter);
-GLIB_AVAILABLE_IN_2_30
-void        g_hash_table_iter_replace      (GHashTableIter *iter,
-                                            gpointer        value);
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_iter_steal        (GHashTableIter *iter);
-
-GLIB_AVAILABLE_IN_ALL
-GHashTable* g_hash_table_ref               (GHashTable     *hash_table);
-GLIB_AVAILABLE_IN_ALL
-void        g_hash_table_unref             (GHashTable     *hash_table);
-
-#ifndef G_DISABLE_DEPRECATED
-#define g_hash_table_freeze(hash_table) ((void)0)
-#define g_hash_table_thaw(hash_table) ((void)0)
-#endif
-
-/* Hash Functions
- */
-GLIB_AVAILABLE_IN_ALL
-gboolean g_str_equal    (gconstpointer  v1,
-                         gconstpointer  v2);
-GLIB_AVAILABLE_IN_ALL
-guint    g_str_hash     (gconstpointer  v);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_int_equal    (gconstpointer  v1,
-                         gconstpointer  v2);
-GLIB_AVAILABLE_IN_ALL
-guint    g_int_hash     (gconstpointer  v);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_int64_equal  (gconstpointer  v1,
-                         gconstpointer  v2);
-GLIB_AVAILABLE_IN_ALL
-guint    g_int64_hash   (gconstpointer  v);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_double_equal (gconstpointer  v1,
-                         gconstpointer  v2);
-GLIB_AVAILABLE_IN_ALL
-guint    g_double_hash  (gconstpointer  v);
-
-GLIB_AVAILABLE_IN_ALL
-guint    g_direct_hash  (gconstpointer  v) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_direct_equal (gconstpointer  v1,
-                         gconstpointer  v2) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_HASH_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/ghmac.h b/linux-x86/include/glib-2.0/glib/ghmac.h
deleted file mode 100644
index 94bc427..0000000
--- a/linux-x86/include/glib-2.0/glib/ghmac.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ghmac.h - secure data hashing
- *
- * Copyright (C) 2011  Stef Walter  <stefw@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_HMAC_H__
-#define __G_HMAC_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-#include "gchecksum.h"
-
-G_BEGIN_DECLS
-
-/**
- * GHmac:
- *
- * An opaque structure representing a HMAC operation.
- * To create a new GHmac, use g_hmac_new(). To free
- * a GHmac, use g_hmac_unref().
- *
- * Since: 2.30
- */
-typedef struct _GHmac       GHmac;
-
-GLIB_AVAILABLE_IN_2_30
-GHmac *               g_hmac_new                    (GChecksumType  digest_type,
-                                                     const guchar  *key,
-                                                     gsize          key_len);
-GLIB_AVAILABLE_IN_2_30
-GHmac *               g_hmac_copy                   (const GHmac   *hmac);
-GLIB_AVAILABLE_IN_2_30
-GHmac *               g_hmac_ref                    (GHmac         *hmac);
-GLIB_AVAILABLE_IN_2_30
-void                  g_hmac_unref                  (GHmac         *hmac);
-GLIB_AVAILABLE_IN_2_30
-void                  g_hmac_update                 (GHmac         *hmac,
-                                                     const guchar  *data,
-                                                     gssize         length);
-GLIB_AVAILABLE_IN_2_30
-const gchar *         g_hmac_get_string             (GHmac         *hmac);
-GLIB_AVAILABLE_IN_2_30
-void                  g_hmac_get_digest             (GHmac         *hmac,
-                                                     guint8        *buffer,
-                                                     gsize         *digest_len);
-
-GLIB_AVAILABLE_IN_2_30
-gchar                *g_compute_hmac_for_data       (GChecksumType  digest_type,
-                                                     const guchar  *key,
-                                                     gsize          key_len,
-                                                     const guchar  *data,
-                                                     gsize          length);
-GLIB_AVAILABLE_IN_2_30
-gchar                *g_compute_hmac_for_string     (GChecksumType  digest_type,
-                                                     const guchar  *key,
-                                                     gsize          key_len,
-                                                     const gchar   *str,
-                                                     gssize         length);
-
-G_END_DECLS
-
-#endif /* __G_CHECKSUM_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/ghook.h b/linux-x86/include/glib-2.0/glib/ghook.h
deleted file mode 100644
index 45e1e27..0000000
--- a/linux-x86/include/glib-2.0/glib/ghook.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_HOOK_H__
-#define __G_HOOK_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs --- */
-typedef struct _GHook		GHook;
-typedef struct _GHookList	GHookList;
-
-typedef gint		(*GHookCompareFunc)	(GHook		*new_hook,
-						 GHook		*sibling);
-typedef gboolean	(*GHookFindFunc)	(GHook		*hook,
-						 gpointer	 data);
-typedef void		(*GHookMarshaller)	(GHook		*hook,
-						 gpointer	 marshal_data);
-typedef gboolean	(*GHookCheckMarshaller)	(GHook		*hook,
-						 gpointer	 marshal_data);
-typedef void		(*GHookFunc)		(gpointer	 data);
-typedef gboolean	(*GHookCheckFunc)	(gpointer	 data);
-typedef void		(*GHookFinalizeFunc)	(GHookList      *hook_list,
-						 GHook          *hook);
-typedef enum
-{
-  G_HOOK_FLAG_ACTIVE	    = 1 << 0,
-  G_HOOK_FLAG_IN_CALL	    = 1 << 1,
-  G_HOOK_FLAG_MASK	    = 0x0f
-} GHookFlagMask;
-#define G_HOOK_FLAG_USER_SHIFT	(4)
-
-
-/* --- structures --- */
-struct _GHookList
-{
-  gulong	    seq_id;
-  guint		    hook_size : 16;
-  guint		    is_setup : 1;
-  GHook		   *hooks;
-  gpointer	    dummy3;
-  GHookFinalizeFunc finalize_hook;
-  gpointer	    dummy[2];
-};
-struct _GHook
-{
-  gpointer	 data;
-  GHook		*next;
-  GHook		*prev;
-  guint		 ref_count;
-  gulong	 hook_id;
-  guint		 flags;
-  gpointer	 func;
-  GDestroyNotify destroy;
-};
-
-
-/* --- macros --- */
-#define	G_HOOK(hook)			((GHook*) (hook))
-#define	G_HOOK_FLAGS(hook)		(G_HOOK (hook)->flags)
-#define	G_HOOK_ACTIVE(hook)		((G_HOOK_FLAGS (hook) & \
-					  G_HOOK_FLAG_ACTIVE) != 0)
-#define	G_HOOK_IN_CALL(hook)		((G_HOOK_FLAGS (hook) & \
-					  G_HOOK_FLAG_IN_CALL) != 0)
-#define G_HOOK_IS_VALID(hook)		(G_HOOK (hook)->hook_id != 0 && \
-					 (G_HOOK_FLAGS (hook) & \
-                                          G_HOOK_FLAG_ACTIVE))
-#define G_HOOK_IS_UNLINKED(hook)	(G_HOOK (hook)->next == NULL && \
-					 G_HOOK (hook)->prev == NULL && \
-					 G_HOOK (hook)->hook_id == 0 && \
-					 G_HOOK (hook)->ref_count == 0)
-
-
-/* --- prototypes --- */
-/* callback maintenance functions */
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_list_init		(GHookList		*hook_list,
-					 guint			 hook_size);
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_list_clear		(GHookList		*hook_list);
-GLIB_AVAILABLE_IN_ALL
-GHook*	 g_hook_alloc			(GHookList		*hook_list);
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_free			(GHookList		*hook_list,
-					 GHook			*hook);
-GLIB_AVAILABLE_IN_ALL
-GHook *	 g_hook_ref			(GHookList		*hook_list,
-					 GHook			*hook);
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_unref			(GHookList		*hook_list,
-					 GHook			*hook);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_hook_destroy			(GHookList		*hook_list,
-					 gulong			 hook_id);
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_destroy_link		(GHookList		*hook_list,
-					 GHook			*hook);
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_prepend			(GHookList		*hook_list,
-					 GHook			*hook);
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_insert_before		(GHookList		*hook_list,
-					 GHook			*sibling,
-					 GHook			*hook);
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_insert_sorted		(GHookList		*hook_list,
-					 GHook			*hook,
-					 GHookCompareFunc	 func);
-GLIB_AVAILABLE_IN_ALL
-GHook*	 g_hook_get			(GHookList		*hook_list,
-					 gulong			 hook_id);
-GLIB_AVAILABLE_IN_ALL
-GHook*	 g_hook_find			(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 GHookFindFunc		 func,
-					 gpointer		 data);
-GLIB_AVAILABLE_IN_ALL
-GHook*	 g_hook_find_data		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 data);
-GLIB_AVAILABLE_IN_ALL
-GHook*	 g_hook_find_func		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 func);
-GLIB_AVAILABLE_IN_ALL
-GHook*	 g_hook_find_func_data		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 func,
-					 gpointer		 data);
-/* return the first valid hook, and increment its reference count */
-GLIB_AVAILABLE_IN_ALL
-GHook*	 g_hook_first_valid		(GHookList		*hook_list,
-					 gboolean		 may_be_in_call);
-/* return the next valid hook with incremented reference count, and
- * decrement the reference count of the original hook
- */
-GLIB_AVAILABLE_IN_ALL
-GHook*	 g_hook_next_valid		(GHookList		*hook_list,
-					 GHook			*hook,
-					 gboolean		 may_be_in_call);
-/* GHookCompareFunc implementation to insert hooks sorted by their id */
-GLIB_AVAILABLE_IN_ALL
-gint	 g_hook_compare_ids		(GHook			*new_hook,
-					 GHook			*sibling);
-/* convenience macros */
-#define	 g_hook_append( hook_list, hook )  \
-     g_hook_insert_before ((hook_list), NULL, (hook))
-/* invoke all valid hooks with the (*GHookFunc) signature.
- */
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_list_invoke		(GHookList		*hook_list,
-					 gboolean		 may_recurse);
-/* invoke all valid hooks with the (*GHookCheckFunc) signature,
- * and destroy the hook if FALSE is returned.
- */
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_list_invoke_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse);
-/* invoke a marshaller on all valid hooks.
- */
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_list_marshal		(GHookList		*hook_list,
-					 gboolean		 may_recurse,
-					 GHookMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void	 g_hook_list_marshal_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse,
-					 GHookCheckMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-
-G_END_DECLS
-
-#endif /* __G_HOOK_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/ghostutils.h b/linux-x86/include/glib-2.0/glib/ghostutils.h
deleted file mode 100644
index dfb64e5..0000000
--- a/linux-x86/include/glib-2.0/glib/ghostutils.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_HOST_UTILS_H__
-#define __G_HOST_UTILS_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_hostname_is_non_ascii     (const gchar *hostname);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_hostname_is_ascii_encoded (const gchar *hostname);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_hostname_is_ip_address    (const gchar *hostname);
-
-GLIB_AVAILABLE_IN_ALL
-gchar    *g_hostname_to_ascii         (const gchar *hostname);
-GLIB_AVAILABLE_IN_ALL
-gchar    *g_hostname_to_unicode       (const gchar *hostname);
-
-G_END_DECLS
-
-#endif /* __G_HOST_UTILS_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gi18n-lib.h b/linux-x86/include/glib-2.0/glib/gi18n-lib.h
deleted file mode 100644
index ca002a7..0000000
--- a/linux-x86/include/glib-2.0/glib/gi18n-lib.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 2002  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_I18N_LIB_H__
-#define __G_I18N_LIB_H__
-
-#include <glib.h>
-
-#include <libintl.h>
-#include <string.h>
-
-#ifndef GETTEXT_PACKAGE
-#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.  Did you forget to include config.h?
-#endif
-
-#define  _(String) ((char *) g_dgettext (GETTEXT_PACKAGE, String))
-#define Q_(String) g_dpgettext (GETTEXT_PACKAGE, String, 0)
-#define N_(String) (String)
-#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE, Context "\004" String, strlen (Context) + 1)
-#define NC_(Context, String) (String)
-
-#endif  /* __G_I18N_LIB_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gi18n.h b/linux-x86/include/glib-2.0/glib/gi18n.h
deleted file mode 100644
index 269bfdf..0000000
--- a/linux-x86/include/glib-2.0/glib/gi18n.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 2002  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_I18N_H__
-#define __G_I18N_H__
-
-#include <glib.h>
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#else
-#define gettext(String) (String)
-#endif
-
-#include <string.h>
-
-#define  _(String) gettext (String)
-#define Q_(String) g_dpgettext (NULL, String, 0)
-#define N_(String) (String)
-#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
-#define NC_(Context, String) (String)
-
-#endif  /* __G_I18N_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/giochannel.h b/linux-x86/include/glib-2.0/glib/giochannel.h
deleted file mode 100644
index 75fa1ef..0000000
--- a/linux-x86/include/glib-2.0/glib/giochannel.h
+++ /dev/null
@@ -1,415 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_IOCHANNEL_H__
-#define __G_IOCHANNEL_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gconvert.h>
-#include <glib/gmain.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-/* GIOChannel
- */
-
-typedef struct _GIOChannel	GIOChannel;
-typedef struct _GIOFuncs        GIOFuncs;
-
-typedef enum
-{
-  G_IO_ERROR_NONE,
-  G_IO_ERROR_AGAIN,
-  G_IO_ERROR_INVAL,
-  G_IO_ERROR_UNKNOWN
-} GIOError;
-
-#define G_IO_CHANNEL_ERROR g_io_channel_error_quark()
-
-typedef enum
-{
-  /* Derived from errno */
-  G_IO_CHANNEL_ERROR_FBIG,
-  G_IO_CHANNEL_ERROR_INVAL,
-  G_IO_CHANNEL_ERROR_IO,
-  G_IO_CHANNEL_ERROR_ISDIR,
-  G_IO_CHANNEL_ERROR_NOSPC,
-  G_IO_CHANNEL_ERROR_NXIO,
-  G_IO_CHANNEL_ERROR_OVERFLOW,
-  G_IO_CHANNEL_ERROR_PIPE,
-  /* Other */
-  G_IO_CHANNEL_ERROR_FAILED
-} GIOChannelError;
-
-typedef enum
-{
-  G_IO_STATUS_ERROR,
-  G_IO_STATUS_NORMAL,
-  G_IO_STATUS_EOF,
-  G_IO_STATUS_AGAIN
-} GIOStatus;
-
-typedef enum
-{
-  G_SEEK_CUR,
-  G_SEEK_SET,
-  G_SEEK_END
-} GSeekType;
-
-typedef enum
-{
-  G_IO_FLAG_APPEND = 1 << 0,
-  G_IO_FLAG_NONBLOCK = 1 << 1,
-  G_IO_FLAG_IS_READABLE = 1 << 2,	/* Read only flag */
-  G_IO_FLAG_IS_WRITABLE = 1 << 3,	/* Read only flag */
-  G_IO_FLAG_IS_WRITEABLE = 1 << 3,      /* Misspelling in 2.29.10 and earlier */
-  G_IO_FLAG_IS_SEEKABLE = 1 << 4,	/* Read only flag */
-  G_IO_FLAG_MASK = (1 << 5) - 1,
-  G_IO_FLAG_GET_MASK = G_IO_FLAG_MASK,
-  G_IO_FLAG_SET_MASK = G_IO_FLAG_APPEND | G_IO_FLAG_NONBLOCK
-} GIOFlags;
-
-struct _GIOChannel
-{
-  /*< private >*/
-  gint ref_count;
-  GIOFuncs *funcs;
-
-  gchar *encoding;
-  GIConv read_cd;
-  GIConv write_cd;
-  gchar *line_term;		/* String which indicates the end of a line of text */
-  guint line_term_len;		/* So we can have null in the line term */
-
-  gsize buf_size;
-  GString *read_buf;		/* Raw data from the channel */
-  GString *encoded_read_buf;    /* Channel data converted to UTF-8 */
-  GString *write_buf;		/* Data ready to be written to the file */
-  gchar partial_write_buf[6];	/* UTF-8 partial characters, null terminated */
-
-  /* Group the flags together, immediately after partial_write_buf, to save memory */
-
-  guint use_buffer     : 1;	/* The encoding uses the buffers */
-  guint do_encode      : 1;	/* The encoding uses the GIConv coverters */
-  guint close_on_unref : 1;	/* Close the channel on final unref */
-  guint is_readable    : 1;	/* Cached GIOFlag */
-  guint is_writeable   : 1;	/* ditto */
-  guint is_seekable    : 1;	/* ditto */
-
-  gpointer reserved1;	
-  gpointer reserved2;	
-};
-
-typedef gboolean (*GIOFunc) (GIOChannel   *source,
-			     GIOCondition  condition,
-			     gpointer      data);
-struct _GIOFuncs
-{
-  GIOStatus (*io_read)           (GIOChannel   *channel, 
-			          gchar        *buf, 
-				  gsize         count,
-				  gsize        *bytes_read,
-				  GError      **err);
-  GIOStatus (*io_write)          (GIOChannel   *channel, 
-				  const gchar  *buf, 
-				  gsize         count,
-				  gsize        *bytes_written,
-				  GError      **err);
-  GIOStatus (*io_seek)           (GIOChannel   *channel, 
-				  gint64        offset, 
-				  GSeekType     type,
-				  GError      **err);
-  GIOStatus  (*io_close)         (GIOChannel   *channel,
-				  GError      **err);
-  GSource*   (*io_create_watch)  (GIOChannel   *channel,
-				  GIOCondition  condition);
-  void       (*io_free)          (GIOChannel   *channel);
-  GIOStatus  (*io_set_flags)     (GIOChannel   *channel,
-                                  GIOFlags      flags,
-				  GError      **err);
-  GIOFlags   (*io_get_flags)     (GIOChannel   *channel);
-};
-
-GLIB_AVAILABLE_IN_ALL
-void        g_io_channel_init   (GIOChannel    *channel);
-GLIB_AVAILABLE_IN_ALL
-GIOChannel *g_io_channel_ref    (GIOChannel    *channel);
-GLIB_AVAILABLE_IN_ALL
-void        g_io_channel_unref  (GIOChannel    *channel);
-
-GLIB_DEPRECATED_FOR(g_io_channel_read_chars)
-GIOError    g_io_channel_read   (GIOChannel    *channel,
-                                 gchar         *buf,
-                                 gsize          count,
-                                 gsize         *bytes_read);
-
-GLIB_DEPRECATED_FOR(g_io_channel_write_chars)
-GIOError  g_io_channel_write    (GIOChannel    *channel,
-                                 const gchar   *buf,
-                                 gsize          count,
-                                 gsize         *bytes_written);
-
-GLIB_DEPRECATED_FOR(g_io_channel_seek_position)
-GIOError  g_io_channel_seek     (GIOChannel    *channel,
-                                 gint64         offset,
-                                 GSeekType      type);
-
-GLIB_DEPRECATED_FOR(g_io_channel_shutdown)
-void      g_io_channel_close    (GIOChannel    *channel);
-
-GLIB_AVAILABLE_IN_ALL
-GIOStatus g_io_channel_shutdown (GIOChannel      *channel,
-				 gboolean         flush,
-				 GError         **err);
-GLIB_AVAILABLE_IN_ALL
-guint     g_io_add_watch_full   (GIOChannel      *channel,
-				 gint             priority,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data,
-				 GDestroyNotify   notify);
-GLIB_AVAILABLE_IN_ALL
-GSource * g_io_create_watch     (GIOChannel      *channel,
-				 GIOCondition     condition);
-GLIB_AVAILABLE_IN_ALL
-guint     g_io_add_watch        (GIOChannel      *channel,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data);
-
-/* character encoding conversion involved functions.
- */
-
-GLIB_AVAILABLE_IN_ALL
-void                  g_io_channel_set_buffer_size      (GIOChannel   *channel,
-							 gsize         size);
-GLIB_AVAILABLE_IN_ALL
-gsize                 g_io_channel_get_buffer_size      (GIOChannel   *channel);
-GLIB_AVAILABLE_IN_ALL
-GIOCondition          g_io_channel_get_buffer_condition (GIOChannel   *channel);
-GLIB_AVAILABLE_IN_ALL
-GIOStatus             g_io_channel_set_flags            (GIOChannel   *channel,
-							 GIOFlags      flags,
-							 GError      **error);
-GLIB_AVAILABLE_IN_ALL
-GIOFlags              g_io_channel_get_flags            (GIOChannel   *channel);
-GLIB_AVAILABLE_IN_ALL
-void                  g_io_channel_set_line_term        (GIOChannel   *channel,
-							 const gchar  *line_term,
-							 gint          length);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_io_channel_get_line_term        (GIOChannel   *channel,
-							 gint         *length);
-GLIB_AVAILABLE_IN_ALL
-void		      g_io_channel_set_buffered		(GIOChannel   *channel,
-							 gboolean      buffered);
-GLIB_AVAILABLE_IN_ALL
-gboolean	      g_io_channel_get_buffered		(GIOChannel   *channel);
-GLIB_AVAILABLE_IN_ALL
-GIOStatus             g_io_channel_set_encoding         (GIOChannel   *channel,
-							 const gchar  *encoding,
-							 GError      **error);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_io_channel_get_encoding         (GIOChannel   *channel);
-GLIB_AVAILABLE_IN_ALL
-void                  g_io_channel_set_close_on_unref	(GIOChannel   *channel,
-							 gboolean      do_close);
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_io_channel_get_close_on_unref	(GIOChannel   *channel);
-
-
-GLIB_AVAILABLE_IN_ALL
-GIOStatus   g_io_channel_flush            (GIOChannel   *channel,
-					   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-GIOStatus   g_io_channel_read_line        (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-GIOStatus   g_io_channel_read_line_string (GIOChannel   *channel,
-					   GString      *buffer,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-GIOStatus   g_io_channel_read_to_end      (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-GIOStatus   g_io_channel_read_chars       (GIOChannel   *channel,
-					   gchar        *buf,
-					   gsize         count,
-					   gsize        *bytes_read,
-					   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-GIOStatus   g_io_channel_read_unichar     (GIOChannel   *channel,
-					   gunichar     *thechar,
-					   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-GIOStatus   g_io_channel_write_chars      (GIOChannel   *channel,
-					   const gchar  *buf,
-					   gssize        count,
-					   gsize        *bytes_written,
-					   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-GIOStatus   g_io_channel_write_unichar    (GIOChannel   *channel,
-					   gunichar      thechar,
-					   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-GIOStatus   g_io_channel_seek_position    (GIOChannel   *channel,
-					   gint64        offset,
-					   GSeekType     type,
-					   GError      **error);
-GLIB_AVAILABLE_IN_ALL
-GIOChannel* g_io_channel_new_file         (const gchar  *filename,
-					   const gchar  *mode,
-					   GError      **error);
-
-/* Error handling */
-
-GLIB_AVAILABLE_IN_ALL
-GQuark          g_io_channel_error_quark      (void);
-GLIB_AVAILABLE_IN_ALL
-GIOChannelError g_io_channel_error_from_errno (gint en);
-
-/* On Unix, IO channels created with this function for any file
- * descriptor or socket.
- *
- * On Win32, this can be used either for files opened with the MSVCRT
- * (the Microsoft run-time C library) _open() or _pipe, including file
- * descriptors 0, 1 and 2 (corresponding to stdin, stdout and stderr),
- * or for Winsock SOCKETs. If the parameter is a legal file
- * descriptor, it is assumed to be such, otherwise it should be a
- * SOCKET. This relies on SOCKETs and file descriptors not
- * overlapping. If you want to be certain, call either
- * g_io_channel_win32_new_fd() or g_io_channel_win32_new_socket()
- * instead as appropriate.
- *
- * The term file descriptor as used in the context of Win32 refers to
- * the emulated Unix-like file descriptors MSVCRT provides. The native
- * corresponding concept is file HANDLE. There isn't as of yet a way to
- * get GIOChannels for Win32 file HANDLEs.
- */
-GLIB_AVAILABLE_IN_ALL
-GIOChannel* g_io_channel_unix_new    (int         fd);
-GLIB_AVAILABLE_IN_ALL
-gint        g_io_channel_unix_get_fd (GIOChannel *channel);
-
-
-/* Hook for GClosure / GSource integration. Don't touch */
-GLIB_VAR GSourceFuncs g_io_watch_funcs;
-
-#ifdef G_OS_WIN32
-
-/* You can use this "pseudo file descriptor" in a GPollFD to add
- * polling for Windows messages. GTK applications should not do that.
- */
-
-#define G_WIN32_MSG_HANDLE 19981206
-
-/* Use this to get a GPollFD from a GIOChannel, so that you can call
- * g_io_channel_win32_poll(). After calling this you should only use
- * g_io_channel_read() to read from the GIOChannel, i.e. never read()
- * from the underlying file descriptor. For SOCKETs, it is possible to call
- * recv().
- */
-GLIB_AVAILABLE_IN_ALL
-void        g_io_channel_win32_make_pollfd (GIOChannel   *channel,
-					    GIOCondition  condition,
-					    GPollFD      *fd);
-
-/* This can be used to wait a until at least one of the channels is readable.
- * On Unix you would do a select() on the file descriptors of the channels.
- */
-GLIB_AVAILABLE_IN_ALL
-gint        g_io_channel_win32_poll   (GPollFD    *fds,
-				       gint        n_fds,
-				       gint        timeout_);
-
-/* Create an IO channel for Windows messages for window handle hwnd. */
-#if GLIB_SIZEOF_VOID_P == 8
-/* We use gsize here so that it is still an integer type and not a
- * pointer, like the guint in the traditional prototype. We can't use
- * intptr_t as that is not portable enough.
- */
-GLIB_AVAILABLE_IN_ALL
-GIOChannel *g_io_channel_win32_new_messages (gsize hwnd);
-#else
-GLIB_AVAILABLE_IN_ALL
-GIOChannel *g_io_channel_win32_new_messages (guint hwnd);
-#endif
-
-/* Create an IO channel for C runtime (emulated Unix-like) file
- * descriptors. After calling g_io_add_watch() on a IO channel
- * returned by this function, you shouldn't call read() on the file
- * descriptor. This is because adding polling for a file descriptor is
- * implemented on Win32 by starting a thread that sits blocked in a
- * read() from the file descriptor most of the time. All reads from
- * the file descriptor should be done by this internal GLib
- * thread. Your code should call only g_io_channel_read_chars().
- */
-GLIB_AVAILABLE_IN_ALL
-GIOChannel* g_io_channel_win32_new_fd (gint         fd);
-
-/* Get the C runtime file descriptor of a channel. */
-GLIB_AVAILABLE_IN_ALL
-gint        g_io_channel_win32_get_fd (GIOChannel *channel);
-
-/* Create an IO channel for a winsock socket. The parameter should be
- * a SOCKET. Contrary to IO channels for file descriptors (on *Win32),
- * you can use normal recv() or recvfrom() on sockets even if GLib
- * is polling them.
- */
-GLIB_AVAILABLE_IN_ALL
-GIOChannel *g_io_channel_win32_new_socket (gint socket);
-
-GLIB_DEPRECATED_FOR(g_io_channel_win32_new_socket)
-GIOChannel *g_io_channel_win32_new_stream_socket (gint socket);
-
-GLIB_AVAILABLE_IN_ALL
-void        g_io_channel_win32_set_debug (GIOChannel *channel,
-                                          gboolean    flag);
-
-#endif
-
-#ifdef G_OS_WIN32
-#define g_io_channel_new_file g_io_channel_new_file_utf8
-
-GLIB_AVAILABLE_IN_ALL
-GIOChannel *g_io_channel_new_file_utf8 (const gchar  *filename,
-                                        const gchar  *mode,
-                                        GError      **error);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_IOCHANNEL_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gkeyfile.h b/linux-x86/include/glib-2.0/glib/gkeyfile.h
deleted file mode 100644
index b37070e..0000000
--- a/linux-x86/include/glib-2.0/glib/gkeyfile.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/* gkeyfile.h - desktop entry file parser
- *
- *  Copyright 2004 Red Hat, Inc.
- *
- *  Ray Strode <halfline@hawaii.rr.com>
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_KEY_FILE_H__
-#define __G_KEY_FILE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  G_KEY_FILE_ERROR_UNKNOWN_ENCODING,
-  G_KEY_FILE_ERROR_PARSE,
-  G_KEY_FILE_ERROR_NOT_FOUND,
-  G_KEY_FILE_ERROR_KEY_NOT_FOUND,
-  G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-  G_KEY_FILE_ERROR_INVALID_VALUE
-} GKeyFileError;
-
-#define G_KEY_FILE_ERROR g_key_file_error_quark()
-
-GLIB_AVAILABLE_IN_ALL
-GQuark g_key_file_error_quark (void);
-
-typedef struct _GKeyFile GKeyFile;
-
-typedef enum
-{
-  G_KEY_FILE_NONE              = 0,
-  G_KEY_FILE_KEEP_COMMENTS     = 1 << 0,
-  G_KEY_FILE_KEEP_TRANSLATIONS = 1 << 1
-} GKeyFileFlags;
-
-GLIB_AVAILABLE_IN_ALL
-GKeyFile *g_key_file_new                    (void);
-GLIB_AVAILABLE_IN_ALL
-GKeyFile *g_key_file_ref                    (GKeyFile             *key_file);
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_unref                  (GKeyFile             *key_file);
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_free                   (GKeyFile             *key_file);
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_list_separator     (GKeyFile             *key_file,
-					     gchar                 separator);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_key_file_load_from_file         (GKeyFile             *key_file,
-					     const gchar          *file,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_key_file_load_from_data         (GKeyFile             *key_file,
-					     const gchar          *data,
-					     gsize                 length,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_key_file_load_from_dirs          (GKeyFile             *key_file,
-					     const gchar	  *file,
-					     const gchar	 **search_dirs,
-					     gchar		 **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_key_file_load_from_data_dirs     (GKeyFile             *key_file,
-					     const gchar          *file,
-					     gchar               **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gchar    *g_key_file_to_data                (GKeyFile             *key_file,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar    *g_key_file_get_start_group        (GKeyFile             *key_file) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar   **g_key_file_get_groups             (GKeyFile             *key_file,
-					     gsize                *length) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar   **g_key_file_get_keys               (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_key_file_has_group              (GKeyFile             *key_file,
-					     const gchar          *group_name);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_key_file_has_key                (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gchar    *g_key_file_get_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *value);
-GLIB_AVAILABLE_IN_ALL
-gchar    *g_key_file_get_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *string);
-GLIB_AVAILABLE_IN_ALL
-gchar    *g_key_file_get_locale_string      (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     GError              **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_locale_string      (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     const gchar          *string);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_key_file_get_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              value);
-GLIB_AVAILABLE_IN_ALL
-gint      g_key_file_get_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  value);
-GLIB_AVAILABLE_IN_ALL
-gint64    g_key_file_get_int64              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_int64              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint64                value);
-GLIB_AVAILABLE_IN_ALL
-guint64   g_key_file_get_uint64             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_uint64             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     guint64               value);
-GLIB_AVAILABLE_IN_ALL
-gdouble   g_key_file_get_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error);
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               value);
-GLIB_AVAILABLE_IN_ALL
-gchar   **g_key_file_get_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar * const   list[],
-					     gsize                 length);
-GLIB_AVAILABLE_IN_ALL
-gchar   **g_key_file_get_locale_string_list (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_locale_string_list (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     const gchar * const   list[],
-					     gsize                 length);
-GLIB_AVAILABLE_IN_ALL
-gboolean *g_key_file_get_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              list[],
-					     gsize                 length);
-GLIB_AVAILABLE_IN_ALL
-gint     *g_key_file_get_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               list[],
-                                             gsize                 length);
-GLIB_AVAILABLE_IN_ALL
-gdouble  *g_key_file_get_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gsize                *length,
-                                             GError              **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void      g_key_file_set_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  list[],
-					     gsize                 length);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_key_file_set_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             const gchar          *comment,
-                                             GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gchar    *g_key_file_get_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error) G_GNUC_MALLOC;
-
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_key_file_remove_comment         (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_key_file_remove_key             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean  g_key_file_remove_group           (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     GError              **error);
-
-/* Defines for handling freedesktop.org Desktop files */
-#define G_KEY_FILE_DESKTOP_GROUP                "Desktop Entry"
-
-#define G_KEY_FILE_DESKTOP_KEY_TYPE             "Type"
-#define G_KEY_FILE_DESKTOP_KEY_VERSION          "Version"
-#define G_KEY_FILE_DESKTOP_KEY_NAME             "Name"
-#define G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME     "GenericName"
-#define G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY       "NoDisplay"
-#define G_KEY_FILE_DESKTOP_KEY_COMMENT          "Comment"
-#define G_KEY_FILE_DESKTOP_KEY_ICON             "Icon"
-#define G_KEY_FILE_DESKTOP_KEY_HIDDEN           "Hidden"
-#define G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN     "OnlyShowIn"
-#define G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN      "NotShowIn"
-#define G_KEY_FILE_DESKTOP_KEY_TRY_EXEC         "TryExec"
-#define G_KEY_FILE_DESKTOP_KEY_EXEC             "Exec"
-#define G_KEY_FILE_DESKTOP_KEY_PATH             "Path"
-#define G_KEY_FILE_DESKTOP_KEY_TERMINAL         "Terminal"
-#define G_KEY_FILE_DESKTOP_KEY_MIME_TYPE        "MimeType"
-#define G_KEY_FILE_DESKTOP_KEY_CATEGORIES       "Categories"
-#define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY   "StartupNotify"
-#define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
-#define G_KEY_FILE_DESKTOP_KEY_URL              "URL"
-#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"
-#define G_KEY_FILE_DESKTOP_KEY_ACTIONS          "Actions"
-
-#define G_KEY_FILE_DESKTOP_TYPE_APPLICATION     "Application"
-#define G_KEY_FILE_DESKTOP_TYPE_LINK            "Link"
-#define G_KEY_FILE_DESKTOP_TYPE_DIRECTORY       "Directory"
-
-G_END_DECLS
-
-#endif /* __G_KEY_FILE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/glist.h b/linux-x86/include/glib-2.0/glib/glist.h
deleted file mode 100644
index 120e788..0000000
--- a/linux-x86/include/glib-2.0/glib/glist.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_LIST_H__
-#define __G_LIST_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gmem.h>
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GList GList;
-
-struct _GList
-{
-  gpointer data;
-  GList *next;
-  GList *prev;
-};
-
-/* Doubly linked lists
- */
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-void     g_list_free                    (GList            *list);
-GLIB_AVAILABLE_IN_ALL
-void     g_list_free_1                  (GList            *list);
-#define  g_list_free1                   g_list_free_1
-GLIB_AVAILABLE_IN_ALL
-void     g_list_free_full               (GList            *list,
-					 GDestroyNotify    free_func);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_append                  (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_prepend                 (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_insert                  (GList            *list,
-					 gpointer          data,
-					 gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_insert_sorted           (GList            *list,
-					 gpointer          data,
-					 GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_insert_sorted_with_data (GList            *list,
-					 gpointer          data,
-					 GCompareDataFunc  func,
-					 gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_insert_before           (GList            *list,
-					 GList            *sibling,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_concat                  (GList            *list1,
-					 GList            *list2) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_remove                  (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_remove_all              (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_remove_link             (GList            *list,
-					 GList            *llink) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_delete_link             (GList            *list,
-					 GList            *link_) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_reverse                 (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_copy                    (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-
-GLIB_AVAILABLE_IN_2_34
-GList*   g_list_copy_deep               (GList            *list,
-					 GCopyFunc         func,
-					 gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_nth                     (GList            *list,
-					 guint             n);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_nth_prev                (GList            *list,
-					 guint             n);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_find                    (GList            *list,
-					 gconstpointer     data);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_find_custom             (GList            *list,
-					 gconstpointer     data,
-					 GCompareFunc      func);
-GLIB_AVAILABLE_IN_ALL
-gint     g_list_position                (GList            *list,
-					 GList            *llink);
-GLIB_AVAILABLE_IN_ALL
-gint     g_list_index                   (GList            *list,
-					 gconstpointer     data);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_last                    (GList            *list);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_first                   (GList            *list);
-GLIB_AVAILABLE_IN_ALL
-guint    g_list_length                  (GList            *list);
-GLIB_AVAILABLE_IN_ALL
-void     g_list_foreach                 (GList            *list,
-					 GFunc             func,
-					 gpointer          user_data);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_sort                    (GList            *list,
-					 GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GList*   g_list_sort_with_data          (GList            *list,
-					 GCompareDataFunc  compare_func,
-					 gpointer          user_data)  G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-gpointer g_list_nth_data                (GList            *list,
-					 guint             n);
-
-
-#define g_list_previous(list)	        ((list) ? (((GList *)(list))->prev) : NULL)
-#define g_list_next(list)	        ((list) ? (((GList *)(list))->next) : NULL)
-
-G_END_DECLS
-
-#endif /* __G_LIST_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gmacros.h b/linux-x86/include/glib-2.0/glib/gmacros.h
deleted file mode 100644
index f3f542b..0000000
--- a/linux-x86/include/glib-2.0/glib/gmacros.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-/* This file must not include any other glib header file and must thus
- * not refer to variables from glibconfig.h
- */
-
-#ifndef __G_MACROS_H__
-#define __G_MACROS_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-/* We include stddef.h to get the system's definition of NULL
- */
-#include <stddef.h>
-
-/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
- * where this is valid. This allows for warningless compilation of
- * "long long" types even in the presence of '-ansi -pedantic'. 
- */
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-#  define G_GNUC_EXTENSION __extension__
-#else
-#  define G_GNUC_EXTENSION
-#endif
-
-/* Provide macros to feature the GCC function attribute.
- */
-#if    __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#define G_GNUC_PURE                            \
-  __attribute__((__pure__))
-#define G_GNUC_MALLOC    			\
-  __attribute__((__malloc__))
-#else
-#define G_GNUC_PURE
-#define G_GNUC_MALLOC
-#endif
-
-#if     __GNUC__ >= 4
-#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-#else
-#define G_GNUC_NULL_TERMINATED
-#endif
-
-#if     (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
-#define G_GNUC_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
-#define G_GNUC_ALLOC_SIZE2(x,y) __attribute__((__alloc_size__(x,y)))
-#else
-#define G_GNUC_ALLOC_SIZE(x)
-#define G_GNUC_ALLOC_SIZE2(x,y)
-#endif
-
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define G_GNUC_PRINTF( format_idx, arg_idx )    \
-  __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-#define G_GNUC_SCANF( format_idx, arg_idx )     \
-  __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
-#define G_GNUC_FORMAT( arg_idx )                \
-  __attribute__((__format_arg__ (arg_idx)))
-#define G_GNUC_NORETURN                         \
-  __attribute__((__noreturn__))
-#define G_GNUC_CONST                            \
-  __attribute__((__const__))
-#define G_GNUC_UNUSED                           \
-  __attribute__((__unused__))
-#define G_GNUC_NO_INSTRUMENT			\
-  __attribute__((__no_instrument_function__))
-#else   /* !__GNUC__ */
-#define G_GNUC_PRINTF( format_idx, arg_idx )
-#define G_GNUC_SCANF( format_idx, arg_idx )
-#define G_GNUC_FORMAT( arg_idx )
-#define G_GNUC_NORETURN
-#define G_GNUC_CONST
-#define G_GNUC_UNUSED
-#define G_GNUC_NO_INSTRUMENT
-#endif  /* !__GNUC__ */
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#define G_GNUC_DEPRECATED                            \
-  __attribute__((__deprecated__))
-#else
-#define G_GNUC_DEPRECATED
-#endif /* __GNUC__ */
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define G_GNUC_DEPRECATED_FOR(f)                        \
-  __attribute__((deprecated("Use " #f " instead")))
-#else
-#define G_GNUC_DEPRECATED_FOR(f)        G_GNUC_DEPRECATED
-#endif /* __GNUC__ */
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS		\
-  _Pragma ("GCC diagnostic push")			\
-  _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#define G_GNUC_END_IGNORE_DEPRECATIONS			\
-  _Pragma ("GCC diagnostic pop")
-#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
-#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS		\
-  __pragma (warning (push))  \
-  __pragma (warning (disable : 4996))
-#define G_GNUC_END_IGNORE_DEPRECATIONS			\
-  __pragma (warning (pop))
-#else
-#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-#define G_GNUC_END_IGNORE_DEPRECATIONS
-#endif
-
-#if     __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-#  define G_GNUC_MAY_ALIAS __attribute__((may_alias))
-#else
-#  define G_GNUC_MAY_ALIAS
-#endif
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#define G_GNUC_WARN_UNUSED_RESULT 		\
-  __attribute__((warn_unused_result))
-#else
-#define G_GNUC_WARN_UNUSED_RESULT
-#endif /* __GNUC__ */
-
-#ifndef G_DISABLE_DEPRECATED
-/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
- * macros, so we can refer to them as strings unconditionally.
- * usage not-recommended since gcc-3.0
- */
-#if defined (__GNUC__) && (__GNUC__ < 3)
-#define G_GNUC_FUNCTION         __FUNCTION__
-#define G_GNUC_PRETTY_FUNCTION  __PRETTY_FUNCTION__
-#else   /* !__GNUC__ */
-#define G_GNUC_FUNCTION         ""
-#define G_GNUC_PRETTY_FUNCTION  ""
-#endif  /* !__GNUC__ */
-#endif  /* !G_DISABLE_DEPRECATED */
-
-/* Clang feature detection: http://clang.llvm.org/docs/LanguageExtensions.html */
-#ifndef __has_feature
-#define __has_feature(x) 0
-#endif
-
-#if __has_feature(attribute_analyzer_noreturn)
-#define G_ANALYZER_ANALYZING 1
-#define G_ANALYZER_NORETURN __attribute__((analyzer_noreturn))
-#else
-#define G_ANALYZER_ANALYZING 0
-#define G_ANALYZER_NORETURN
-#endif
-
-#define G_STRINGIFY(macro_or_string)	G_STRINGIFY_ARG (macro_or_string)
-#define	G_STRINGIFY_ARG(contents)	#contents
-
-#ifndef __GI_SCANNER__ /* The static assert macro really confuses the introspection parser */
-#define G_PASTE_ARGS(identifier1,identifier2) identifier1 ## identifier2
-#define G_PASTE(identifier1,identifier2)      G_PASTE_ARGS (identifier1, identifier2)
-#ifdef __COUNTER__
-#define G_STATIC_ASSERT(expr) typedef char G_PASTE (_GStaticAssertCompileTimeAssertion_, __COUNTER__)[(expr) ? 1 : -1] G_GNUC_UNUSED
-#else
-#define G_STATIC_ASSERT(expr) typedef char G_PASTE (_GStaticAssertCompileTimeAssertion_, __LINE__)[(expr) ? 1 : -1] G_GNUC_UNUSED
-#endif
-#define G_STATIC_ASSERT_EXPR(expr) ((void) sizeof (char[(expr) ? 1 : -1]))
-#endif
-
-/* Provide a string identifying the current code position */
-#if defined(__GNUC__) && (__GNUC__ < 3) && !defined(__cplusplus)
-#  define G_STRLOC	__FILE__ ":" G_STRINGIFY (__LINE__) ":" __PRETTY_FUNCTION__ "()"
-#else
-#  define G_STRLOC	__FILE__ ":" G_STRINGIFY (__LINE__)
-#endif
-
-/* Provide a string identifying the current function, non-concatenatable */
-#if defined (__GNUC__) && defined (__cplusplus)
-#  define G_STRFUNC     ((const char*) (__PRETTY_FUNCTION__))
-#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 19901L
-#  define G_STRFUNC     ((const char*) (__func__))
-#elif defined (__GNUC__) || (defined(_MSC_VER) && (_MSC_VER > 1300))
-#  define G_STRFUNC     ((const char*) (__FUNCTION__))
-#else
-#  define G_STRFUNC     ((const char*) ("???"))
-#endif
-
-/* Guard C code in headers, while including them from C++ */
-#ifdef  __cplusplus
-# define G_BEGIN_DECLS  extern "C" {
-# define G_END_DECLS    }
-#else
-# define G_BEGIN_DECLS
-# define G_END_DECLS
-#endif
-
-/* Provide definitions for some commonly used macros.
- *  Some of them are only provided if they haven't already
- *  been defined. It is assumed that if they are already
- *  defined then the current definition is correct.
- */
-#ifndef NULL
-#  ifdef __cplusplus
-#    define NULL        (0L)
-#  else /* !__cplusplus */
-#    define NULL        ((void*) 0)
-#  endif /* !__cplusplus */
-#endif
-
-#ifndef	FALSE
-#define	FALSE	(0)
-#endif
-
-#ifndef	TRUE
-#define	TRUE	(!FALSE)
-#endif
-
-#undef	MAX
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
-
-#undef	MIN
-#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
-
-#undef	ABS
-#define ABS(a)	   (((a) < 0) ? -(a) : (a))
-
-#undef	CLAMP
-#define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
-
-/* Count the number of elements in an array. The array must be defined
- * as such; using this with a dynamically allocated array will give
- * incorrect results.
- */
-#define G_N_ELEMENTS(arr)		(sizeof (arr) / sizeof ((arr)[0]))
-
-/* Macros by analogy to GINT_TO_POINTER, GPOINTER_TO_INT
- */
-#define GPOINTER_TO_SIZE(p)	((gsize) (p))
-#define GSIZE_TO_POINTER(s)	((gpointer) (gsize) (s))
-
-/* Provide convenience macros for handling structure
- * fields through their offsets.
- */
-
-#if defined(__GNUC__)  && __GNUC__ >= 4
-#  define G_STRUCT_OFFSET(struct_type, member) \
-      ((glong) offsetof (struct_type, member))
-#else
-#  define G_STRUCT_OFFSET(struct_type, member)	\
-      ((glong) ((guint8*) &((struct_type*) 0)->member))
-#endif
-
-#define G_STRUCT_MEMBER_P(struct_p, struct_offset)   \
-    ((gpointer) ((guint8*) (struct_p) + (glong) (struct_offset)))
-#define G_STRUCT_MEMBER(member_type, struct_p, struct_offset)   \
-    (*(member_type*) G_STRUCT_MEMBER_P ((struct_p), (struct_offset)))
-
-/* Provide simple macro statement wrappers:
- *   G_STMT_START { statements; } G_STMT_END;
- * This can be used as a single statement, like:
- *   if (x) G_STMT_START { ... } G_STMT_END; else ...
- * This intentionally does not use compiler extensions like GCC's '({...})' to
- * avoid portability issue or side effects when compiled with different compilers.
- */
-#if !(defined (G_STMT_START) && defined (G_STMT_END))
-#  define G_STMT_START  do
-#  define G_STMT_END    while (0)
-#endif
-
-/* Deprecated -- do not use. */
-#ifndef G_DISABLE_DEPRECATED
-#ifdef G_DISABLE_CONST_RETURNS
-#define G_CONST_RETURN
-#else
-#define G_CONST_RETURN const
-#endif
-#endif
-
-/*
- * The G_LIKELY and G_UNLIKELY macros let the programmer give hints to 
- * the compiler about the expected result of an expression. Some compilers
- * can use this information for optimizations.
- *
- * The _G_BOOLEAN_EXPR macro is intended to trigger a gcc warning when
- * putting assignments in g_return_if_fail ().  
- */
-#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-#define _G_BOOLEAN_EXPR(expr)                   \
- G_GNUC_EXTENSION ({                            \
-   int _g_boolean_var_;                         \
-   if (expr)                                    \
-      _g_boolean_var_ = 1;                      \
-   else                                         \
-      _g_boolean_var_ = 0;                      \
-   _g_boolean_var_;                             \
-})
-#define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 1))
-#define G_UNLIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 0))
-#else
-#define G_LIKELY(expr) (expr)
-#define G_UNLIKELY(expr) (expr)
-#endif
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#define G_DEPRECATED __attribute__((__deprecated__))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
-#define G_DEPRECATED __declspec(deprecated)
-#else
-#define G_DEPRECATED
-#endif
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define G_DEPRECATED_FOR(f) __attribute__((__deprecated__("Use '" #f "' instead")))
-#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
-#define G_DEPRECATED_FOR(f) __declspec(deprecated("is deprecated. Use '" #f "' instead"))
-#else
-#define G_DEPRECATED_FOR(f) G_DEPRECATED
-#endif
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define G_UNAVAILABLE(maj,min) __attribute__((deprecated("Not available before " #maj "." #min)))
-#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
-#define G_UNAVAILABLE(maj,min) __declspec(deprecated("is not available before " #maj "." #min))
-#else
-#define G_UNAVAILABLE(maj,min) G_DEPRECATED
-#endif
-
-#ifndef _GLIB_EXTERN
-#define _GLIB_EXTERN extern
-#endif
-
-/* These macros are used to mark deprecated functions in GLib headers,
- * and thus have to be exposed in installed headers. But please
- * do *not* use them in other projects. Instead, use G_DEPRECATED
- * or define your own wrappers around it.
- */
-
-#ifdef GLIB_DISABLE_DEPRECATION_WARNINGS
-#define GLIB_DEPRECATED _GLIB_EXTERN
-#define GLIB_DEPRECATED_FOR(f) _GLIB_EXTERN
-#define GLIB_UNAVAILABLE(maj,min) _GLIB_EXTERN
-#else
-#define GLIB_DEPRECATED G_DEPRECATED _GLIB_EXTERN
-#define GLIB_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _GLIB_EXTERN
-#define GLIB_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _GLIB_EXTERN
-#endif
-
-#endif /* __G_MACROS_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gmain.h b/linux-x86/include/glib-2.0/glib/gmain.h
deleted file mode 100644
index c455353..0000000
--- a/linux-x86/include/glib-2.0/glib/gmain.h
+++ /dev/null
@@ -1,616 +0,0 @@
-/* gmain.h - the GLib Main loop
- * Copyright (C) 1998-2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_MAIN_H__
-#define __G_MAIN_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gpoll.h>
-#include <glib/gslist.h>
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef enum /*< flags >*/
-{
-  G_IO_IN	GLIB_SYSDEF_POLLIN,
-  G_IO_OUT	GLIB_SYSDEF_POLLOUT,
-  G_IO_PRI	GLIB_SYSDEF_POLLPRI,
-  G_IO_ERR	GLIB_SYSDEF_POLLERR,
-  G_IO_HUP	GLIB_SYSDEF_POLLHUP,
-  G_IO_NVAL	GLIB_SYSDEF_POLLNVAL
-} GIOCondition;
-
-
-/**
- * GMainContext:
- *
- * The <structname>GMainContext</structname> struct is an opaque data
- * type representing a set of sources to be handled in a main loop.
- */
-typedef struct _GMainContext            GMainContext;
-
-/**
- * GMainLoop:
- *
- * The <structname>GMainLoop</structname> struct is an opaque data type
- * representing the main event loop of a GLib or GTK+ application.
- */
-typedef struct _GMainLoop               GMainLoop;
-
-/**
- * GSource:
- *
- * The <structname>GSource</structname> struct is an opaque data type
- * representing an event source.
- */
-typedef struct _GSource                 GSource;
-typedef struct _GSourcePrivate          GSourcePrivate;
-
-/**
- * GSourceCallbackFuncs:
- * @ref: Called when a reference is added to the callback object
- * @unref: Called when a reference to the callback object is dropped
- * @get: Called to extract the callback function and data from the
- *     callback object.
-
- * The <structname>GSourceCallbackFuncs</structname> struct contains
- * functions for managing callback objects.
- */
-typedef struct _GSourceCallbackFuncs    GSourceCallbackFuncs;
-
-/**
- * GSourceFuncs:
- * @prepare: Called before all the file descriptors are polled. If the
- *     source can determine that it is ready here (without waiting for the
- *     results of the poll() call) it should return %TRUE. It can also return
- *     a @timeout_ value which should be the maximum timeout (in milliseconds)
- *     which should be passed to the poll() call. The actual timeout used will
- *     be -1 if all sources returned -1, or it will be the minimum of all
- *     the @timeout_ values returned which were >= 0.  Since 2.36 this may
- *     be %NULL, in which case the effect is as if the function always returns
- *     %FALSE with a timeout of -1.  If @prepare returns a
- *     timeout and the source also has a 'ready time' set then the
- *     nearer of the two will be used.
- * @check: Called after all the file descriptors are polled. The source
- *     should return %TRUE if it is ready to be dispatched. Note that some
- *     time may have passed since the previous prepare function was called,
- *     so the source should be checked again here.  Since 2.36 this may
- *     be %NULL, in which case the effect is as if the function always returns
- *     %FALSE.
- * @dispatch: Called to dispatch the event source, after it has returned
- *     %TRUE in either its @prepare or its @check function. The @dispatch
- *     function is passed in a callback function and data. The callback
- *     function may be %NULL if the source was never connected to a callback
- *     using g_source_set_callback(). The @dispatch function should call the
- *     callback function with @user_data and whatever additional parameters
- *     are needed for this type of event source.
- * @finalize: Called when the source is finalized.
- *
- * The <structname>GSourceFuncs</structname> struct contains a table of
- * functions used to handle event sources in a generic manner.
- *
- * For idle sources, the prepare and check functions always return %TRUE
- * to indicate that the source is always ready to be processed. The prepare
- * function also returns a timeout value of 0 to ensure that the poll() call
- * doesn't block (since that would be time wasted which could have been spent
- * running the idle function).
- *
- * For timeout sources, the prepare and check functions both return %TRUE
- * if the timeout interval has expired. The prepare function also returns
- * a timeout value to ensure that the poll() call doesn't block too long
- * and miss the next timeout.
- *
- * For file descriptor sources, the prepare function typically returns %FALSE,
- * since it must wait until poll() has been called before it knows whether
- * any events need to be processed. It sets the returned timeout to -1 to
- * indicate that it doesn't mind how long the poll() call blocks. In the
- * check function, it tests the results of the poll() call to see if the
- * required condition has been met, and returns %TRUE if so.
- */
-typedef struct _GSourceFuncs            GSourceFuncs;
-
-/**
- * GPid:
- *
- * A type which is used to hold a process identification.
- *
- * On UNIX, processes are identified by a process id (an integer),
- * while Windows uses process handles (which are pointers).
- *
- * GPid is used in GLib only for descendant processes spawned with
- * the g_spawn functions.
- */
-
-/**
- * GSourceFunc:
- * @user_data: data passed to the function, set when the source was
- *     created with one of the above functions
- *
- * Specifies the type of function passed to g_timeout_add(),
- * g_timeout_add_full(), g_idle_add(), and g_idle_add_full().
- *
- * Returns: %FALSE if the source should be removed. #G_SOURCE_CONTINUE and
- * #G_SOURCE_REMOVE are more memorable names for the return value.
- */
-typedef gboolean (*GSourceFunc)       (gpointer user_data);
-
-/**
- * GChildWatchFunc:
- * @pid: the process id of the child process
- * @status: Status information about the child process, encoded
- *     in a platform-specific manner
- * @user_data: user data passed to g_child_watch_add()
- *
- * Prototype of a #GChildWatchSource callback, called when a child
- * process has exited.  To interpret @status, see the documentation
- * for g_spawn_check_exit_status().
- */
-typedef void     (*GChildWatchFunc)   (GPid     pid,
-                                       gint     status,
-                                       gpointer user_data);
-struct _GSource
-{
-  /*< private >*/
-  gpointer callback_data;
-  GSourceCallbackFuncs *callback_funcs;
-
-  const GSourceFuncs *source_funcs;
-  guint ref_count;
-
-  GMainContext *context;
-
-  gint priority;
-  guint flags;
-  guint source_id;
-
-  GSList *poll_fds;
-  
-  GSource *prev;
-  GSource *next;
-
-  char    *name;
-
-  GSourcePrivate *priv;
-};
-
-struct _GSourceCallbackFuncs
-{
-  void (*ref)   (gpointer     cb_data);
-  void (*unref) (gpointer     cb_data);
-  void (*get)   (gpointer     cb_data,
-                 GSource     *source, 
-                 GSourceFunc *func,
-                 gpointer    *data);
-};
-
-/**
- * GSourceDummyMarshal:
- *
- * This is just a placeholder for #GClosureMarshal,
- * which cannot be used here for dependency reasons.
- */
-typedef void (*GSourceDummyMarshal) (void);
-
-struct _GSourceFuncs
-{
-  gboolean (*prepare)  (GSource    *source,
-                        gint       *timeout_);
-  gboolean (*check)    (GSource    *source);
-  gboolean (*dispatch) (GSource    *source,
-                        GSourceFunc callback,
-                        gpointer    user_data);
-  void     (*finalize) (GSource    *source); /* Can be NULL */
-
-  /*< private >*/
-  /* For use by g_source_set_closure */
-  GSourceFunc     closure_callback;        
-  GSourceDummyMarshal closure_marshal; /* Really is of type GClosureMarshal */
-};
-
-/* Standard priorities */
-
-/**
- * G_PRIORITY_HIGH:
- *
- * Use this for high priority event sources.
- *
- * It is not used within GLib or GTK+.
- */
-#define G_PRIORITY_HIGH            -100
-
-/**
- * G_PRIORITY_DEFAULT:
- *
- * Use this for default priority event sources.
- *
- * In GLib this priority is used when adding timeout functions
- * with g_timeout_add(). In GDK this priority is used for events
- * from the X server.
- */
-#define G_PRIORITY_DEFAULT          0
-
-/**
- * G_PRIORITY_HIGH_IDLE:
- *
- * Use this for high priority idle functions.
- *
- * GTK+ uses #G_PRIORITY_HIGH_IDLE + 10 for resizing operations,
- * and #G_PRIORITY_HIGH_IDLE + 20 for redrawing operations. (This is
- * done to ensure that any pending resizes are processed before any
- * pending redraws, so that widgets are not redrawn twice unnecessarily.)
- */
-#define G_PRIORITY_HIGH_IDLE        100
-
-/**
- * G_PRIORITY_DEFAULT_IDLE:
- *
- * Use this for default priority idle functions.
- *
- * In GLib this priority is used when adding idle functions with
- * g_idle_add().
- */
-#define G_PRIORITY_DEFAULT_IDLE     200
-
-/**
- * G_PRIORITY_LOW:
- *
- * Use this for very low priority background tasks.
- *
- * It is not used within GLib or GTK+.
- */
-#define G_PRIORITY_LOW              300
-
-/**
- * G_SOURCE_REMOVE:
- *
- * Use this macro as the return value of a #GSourceFunc to remove
- * the #GSource from the main loop.
- *
- * Since: 2.32
- */
-#define G_SOURCE_REMOVE         FALSE
-
-/**
- * G_SOURCE_CONTINUE:
- *
- * Use this macro as the return value of a #GSourceFunc to leave
- * the #GSource in the main loop.
- *
- * Since: 2.32
- */
-#define G_SOURCE_CONTINUE       TRUE
-
-/* GMainContext: */
-
-GLIB_AVAILABLE_IN_ALL
-GMainContext *g_main_context_new       (void);
-GLIB_AVAILABLE_IN_ALL
-GMainContext *g_main_context_ref       (GMainContext *context);
-GLIB_AVAILABLE_IN_ALL
-void          g_main_context_unref     (GMainContext *context);
-GLIB_AVAILABLE_IN_ALL
-GMainContext *g_main_context_default   (void);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_main_context_iteration (GMainContext *context,
-                                        gboolean      may_block);
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_main_context_pending   (GMainContext *context);
-
-/* For implementation of legacy interfaces
- */
-GLIB_AVAILABLE_IN_ALL
-GSource      *g_main_context_find_source_by_id              (GMainContext *context,
-                                                             guint         source_id);
-GLIB_AVAILABLE_IN_ALL
-GSource      *g_main_context_find_source_by_user_data       (GMainContext *context,
-                                                             gpointer      user_data);
-GLIB_AVAILABLE_IN_ALL
-GSource      *g_main_context_find_source_by_funcs_user_data (GMainContext *context,
-                                                             GSourceFuncs *funcs,
-                                                             gpointer      user_data);
-
-/* Low level functions for implementing custom main loops.
- */
-GLIB_AVAILABLE_IN_ALL
-void     g_main_context_wakeup  (GMainContext *context);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_main_context_acquire (GMainContext *context);
-GLIB_AVAILABLE_IN_ALL
-void     g_main_context_release (GMainContext *context);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_main_context_is_owner (GMainContext *context);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_main_context_wait    (GMainContext *context,
-                                 GCond        *cond,
-                                 GMutex       *mutex);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_main_context_prepare  (GMainContext *context,
-                                  gint         *priority);
-GLIB_AVAILABLE_IN_ALL
-gint     g_main_context_query    (GMainContext *context,
-                                  gint          max_priority,
-                                  gint         *timeout_,
-                                  GPollFD      *fds,
-                                  gint          n_fds);
-GLIB_AVAILABLE_IN_ALL
-gint     g_main_context_check    (GMainContext *context,
-                                  gint          max_priority,
-                                  GPollFD      *fds,
-                                  gint          n_fds);
-GLIB_AVAILABLE_IN_ALL
-void     g_main_context_dispatch (GMainContext *context);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_main_context_set_poll_func (GMainContext *context,
-                                       GPollFunc     func);
-GLIB_AVAILABLE_IN_ALL
-GPollFunc g_main_context_get_poll_func (GMainContext *context);
-
-/* Low level functions for use by source implementations
- */
-GLIB_AVAILABLE_IN_ALL
-void     g_main_context_add_poll    (GMainContext *context,
-                                     GPollFD      *fd,
-                                     gint          priority);
-GLIB_AVAILABLE_IN_ALL
-void     g_main_context_remove_poll (GMainContext *context,
-                                     GPollFD      *fd);
-
-GLIB_AVAILABLE_IN_ALL
-gint     g_main_depth               (void);
-GLIB_AVAILABLE_IN_ALL
-GSource *g_main_current_source      (void);
-
-/* GMainContexts for other threads
- */
-GLIB_AVAILABLE_IN_ALL
-void          g_main_context_push_thread_default (GMainContext *context);
-GLIB_AVAILABLE_IN_ALL
-void          g_main_context_pop_thread_default  (GMainContext *context);
-GLIB_AVAILABLE_IN_ALL
-GMainContext *g_main_context_get_thread_default  (void);
-GLIB_AVAILABLE_IN_ALL
-GMainContext *g_main_context_ref_thread_default  (void);
-
-/* GMainLoop: */
-
-GLIB_AVAILABLE_IN_ALL
-GMainLoop *g_main_loop_new        (GMainContext *context,
-                                   gboolean      is_running);
-GLIB_AVAILABLE_IN_ALL
-void       g_main_loop_run        (GMainLoop    *loop);
-GLIB_AVAILABLE_IN_ALL
-void       g_main_loop_quit       (GMainLoop    *loop);
-GLIB_AVAILABLE_IN_ALL
-GMainLoop *g_main_loop_ref        (GMainLoop    *loop);
-GLIB_AVAILABLE_IN_ALL
-void       g_main_loop_unref      (GMainLoop    *loop);
-GLIB_AVAILABLE_IN_ALL
-gboolean   g_main_loop_is_running (GMainLoop    *loop);
-GLIB_AVAILABLE_IN_ALL
-GMainContext *g_main_loop_get_context (GMainLoop    *loop);
-
-/* GSource: */
-
-GLIB_AVAILABLE_IN_ALL
-GSource *g_source_new             (GSourceFuncs   *source_funcs,
-                                   guint           struct_size);
-GLIB_AVAILABLE_IN_ALL
-GSource *g_source_ref             (GSource        *source);
-GLIB_AVAILABLE_IN_ALL
-void     g_source_unref           (GSource        *source);
-
-GLIB_AVAILABLE_IN_ALL
-guint    g_source_attach          (GSource        *source,
-                                   GMainContext   *context);
-GLIB_AVAILABLE_IN_ALL
-void     g_source_destroy         (GSource        *source);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_source_set_priority    (GSource        *source,
-                                   gint            priority);
-GLIB_AVAILABLE_IN_ALL
-gint     g_source_get_priority    (GSource        *source);
-GLIB_AVAILABLE_IN_ALL
-void     g_source_set_can_recurse (GSource        *source,
-                                   gboolean        can_recurse);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_source_get_can_recurse (GSource        *source);
-GLIB_AVAILABLE_IN_ALL
-guint    g_source_get_id          (GSource        *source);
-
-GLIB_AVAILABLE_IN_ALL
-GMainContext *g_source_get_context (GSource       *source);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_source_set_callback    (GSource        *source,
-                                   GSourceFunc     func,
-                                   gpointer        data,
-                                   GDestroyNotify  notify);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_source_set_funcs       (GSource        *source,
-                                   GSourceFuncs   *funcs);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_source_is_destroyed    (GSource        *source);
-
-GLIB_AVAILABLE_IN_ALL
-void                 g_source_set_name       (GSource        *source,
-                                              const char     *name);
-GLIB_AVAILABLE_IN_ALL
-const char *         g_source_get_name       (GSource        *source);
-GLIB_AVAILABLE_IN_ALL
-void                 g_source_set_name_by_id (guint           tag,
-                                              const char     *name);
-
-GLIB_AVAILABLE_IN_2_36
-void                 g_source_set_ready_time (GSource        *source,
-                                              gint64          ready_time);
-GLIB_AVAILABLE_IN_2_36
-gint64               g_source_get_ready_time (GSource        *source);
-
-#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_2_36
-gpointer             g_source_add_unix_fd    (GSource        *source,
-                                              gint            fd,
-                                              GIOCondition    events);
-GLIB_AVAILABLE_IN_2_36
-void                 g_source_modify_unix_fd (GSource        *source,
-                                              gpointer        tag,
-                                              GIOCondition    new_events);
-GLIB_AVAILABLE_IN_2_36
-void                 g_source_remove_unix_fd (GSource        *source,
-                                              gpointer        tag);
-GLIB_AVAILABLE_IN_2_36
-GIOCondition         g_source_query_unix_fd  (GSource        *source,
-                                              gpointer        tag);
-#endif
-
-/* Used to implement g_source_connect_closure and internally*/
-GLIB_AVAILABLE_IN_ALL
-void g_source_set_callback_indirect (GSource              *source,
-                                     gpointer              callback_data,
-                                     GSourceCallbackFuncs *callback_funcs);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_source_add_poll            (GSource        *source,
-				       GPollFD        *fd);
-GLIB_AVAILABLE_IN_ALL
-void     g_source_remove_poll         (GSource        *source,
-				       GPollFD        *fd);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_source_add_child_source    (GSource        *source,
-				       GSource        *child_source);
-GLIB_AVAILABLE_IN_ALL
-void     g_source_remove_child_source (GSource        *source,
-				       GSource        *child_source);
-
-GLIB_DEPRECATED_IN_2_28_FOR(g_source_get_time)
-void     g_source_get_current_time (GSource        *source,
-                                    GTimeVal       *timeval);
-
-GLIB_AVAILABLE_IN_ALL
-gint64   g_source_get_time         (GSource        *source);
-
- /* void g_source_connect_closure (GSource        *source,
-                                  GClosure       *closure);
- */
-
-/* Specific source types
- */
-GLIB_AVAILABLE_IN_ALL
-GSource *g_idle_source_new        (void);
-GLIB_AVAILABLE_IN_ALL
-GSource *g_child_watch_source_new (GPid pid);
-GLIB_AVAILABLE_IN_ALL
-GSource *g_timeout_source_new     (guint interval);
-GLIB_AVAILABLE_IN_ALL
-GSource *g_timeout_source_new_seconds (guint interval);
-
-/* Miscellaneous functions
- */
-GLIB_AVAILABLE_IN_ALL
-void   g_get_current_time                 (GTimeVal       *result);
-GLIB_AVAILABLE_IN_ALL
-gint64 g_get_monotonic_time               (void);
-GLIB_AVAILABLE_IN_ALL
-gint64 g_get_real_time                    (void);
-
-
-/* Source manipulation by ID */
-GLIB_AVAILABLE_IN_ALL
-gboolean g_source_remove                     (guint          tag);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_source_remove_by_user_data        (gpointer       user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
-                                              gpointer       user_data);
-
-/* Idles, child watchers and timeouts */
-GLIB_AVAILABLE_IN_ALL
-guint    g_timeout_add_full         (gint            priority,
-                                     guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-GLIB_AVAILABLE_IN_ALL
-guint    g_timeout_add              (guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-GLIB_AVAILABLE_IN_ALL
-guint    g_timeout_add_seconds_full (gint            priority,
-                                     guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-GLIB_AVAILABLE_IN_ALL
-guint    g_timeout_add_seconds      (guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-GLIB_AVAILABLE_IN_ALL
-guint    g_child_watch_add_full     (gint            priority,
-                                     GPid            pid,
-                                     GChildWatchFunc function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-GLIB_AVAILABLE_IN_ALL
-guint    g_child_watch_add          (GPid            pid,
-                                     GChildWatchFunc function,
-                                     gpointer        data);
-GLIB_AVAILABLE_IN_ALL
-guint    g_idle_add                 (GSourceFunc     function,
-                                     gpointer        data);
-GLIB_AVAILABLE_IN_ALL
-guint    g_idle_add_full            (gint            priority,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_idle_remove_by_data      (gpointer        data);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_main_context_invoke_full (GMainContext   *context,
-                                     gint            priority,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-GLIB_AVAILABLE_IN_ALL
-void     g_main_context_invoke      (GMainContext   *context,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-
-/* Hook for GClosure / GSource integration. Don't touch */
-GLIB_VAR GSourceFuncs g_timeout_funcs;
-GLIB_VAR GSourceFuncs g_child_watch_funcs;
-GLIB_VAR GSourceFuncs g_idle_funcs;
-#ifdef G_OS_UNIX
-GLIB_VAR GSourceFuncs g_unix_signal_funcs;
-GLIB_VAR GSourceFuncs g_unix_fd_source_funcs;
-#endif
-
-G_END_DECLS
-
-#endif /* __G_MAIN_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gmappedfile.h b/linux-x86/include/glib-2.0/glib/gmappedfile.h
deleted file mode 100644
index a1c7ac7..0000000
--- a/linux-x86/include/glib-2.0/glib/gmappedfile.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * gmappedfile.h: Simplified wrapper around the mmap function
- *
- * Copyright 2005 Matthias Clasen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_MAPPED_FILE_H__
-#define __G_MAPPED_FILE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gbytes.h>
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMappedFile GMappedFile;
-
-GLIB_AVAILABLE_IN_ALL
-GMappedFile *g_mapped_file_new          (const gchar  *filename,
-				         gboolean      writable,
-				         GError      **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-GMappedFile *g_mapped_file_new_from_fd  (gint          fd,
-					 gboolean      writable,
-					 GError      **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gsize        g_mapped_file_get_length   (GMappedFile  *file);
-GLIB_AVAILABLE_IN_ALL
-gchar       *g_mapped_file_get_contents (GMappedFile  *file);
-GLIB_AVAILABLE_IN_2_34
-GBytes *     g_mapped_file_get_bytes    (GMappedFile  *file);
-GLIB_AVAILABLE_IN_ALL
-GMappedFile *g_mapped_file_ref          (GMappedFile  *file);
-GLIB_AVAILABLE_IN_ALL
-void         g_mapped_file_unref        (GMappedFile  *file);
-
-GLIB_DEPRECATED_FOR(g_mapped_file_unref)
-void         g_mapped_file_free         (GMappedFile  *file);
-
-G_END_DECLS
-
-#endif /* __G_MAPPED_FILE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gmarkup.h b/linux-x86/include/glib-2.0/glib/gmarkup.h
deleted file mode 100644
index eb7214d..0000000
--- a/linux-x86/include/glib-2.0/glib/gmarkup.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/* gmarkup.h - Simple XML-like string parser/writer
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_MARKUP_H__
-#define __G_MARKUP_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <stdarg.h>
-
-#include <glib/gerror.h>
-#include <glib/gslist.h>
-
-G_BEGIN_DECLS
-
-/**
- * GMarkupError:
- * @G_MARKUP_ERROR_BAD_UTF8: text being parsed was not valid UTF-8
- * @G_MARKUP_ERROR_EMPTY: document contained nothing, or only whitespace
- * @G_MARKUP_ERROR_PARSE: document was ill-formed
- * @G_MARKUP_ERROR_UNKNOWN_ELEMENT: error should be set by #GMarkupParser
- *     functions; element wasn't known
- * @G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE: error should be set by #GMarkupParser
- *     functions; attribute wasn't known
- * @G_MARKUP_ERROR_INVALID_CONTENT: error should be set by #GMarkupParser
- *     functions; content was invalid
- * @G_MARKUP_ERROR_MISSING_ATTRIBUTE: error should be set by #GMarkupParser
- *     functions; a required attribute was missing
- *
- * Error codes returned by markup parsing.
- */
-typedef enum
-{
-  G_MARKUP_ERROR_BAD_UTF8,
-  G_MARKUP_ERROR_EMPTY,
-  G_MARKUP_ERROR_PARSE,
-  /* The following are primarily intended for specific GMarkupParser
-   * implementations to set.
-   */
-  G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-  G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
-  G_MARKUP_ERROR_INVALID_CONTENT,
-  G_MARKUP_ERROR_MISSING_ATTRIBUTE
-} GMarkupError;
-
-/**
- * G_MARKUP_ERROR:
- *
- * Error domain for markup parsing.
- * Errors in this domain will be from the #GMarkupError enumeration.
- * See #GError for information on error domains.
- */
-#define G_MARKUP_ERROR g_markup_error_quark ()
-
-GLIB_AVAILABLE_IN_ALL
-GQuark g_markup_error_quark (void);
-
-/**
- * GMarkupParseFlags:
- * @G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG: flag you should not use
- * @G_MARKUP_TREAT_CDATA_AS_TEXT: When this flag is set, CDATA marked
- *     sections are not passed literally to the @passthrough function of
- *     the parser. Instead, the content of the section (without the
- *     <literal>&lt;![CDATA[</literal> and <literal>]]&gt;</literal>) is
- *     passed to the @text function. This flag was added in GLib 2.12
- * @G_MARKUP_PREFIX_ERROR_POSITION: Normally errors caught by GMarkup
- *     itself have line/column information prefixed to them to let the
- *     caller know the location of the error. When this flag is set the
- *     location information is also prefixed to errors generated by the
- *     #GMarkupParser implementation functions
- *
- * Flags that affect the behaviour of the parser.
- */
-typedef enum
-{
-  G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0,
-  G_MARKUP_TREAT_CDATA_AS_TEXT              = 1 << 1,
-  G_MARKUP_PREFIX_ERROR_POSITION            = 1 << 2
-} GMarkupParseFlags;
-
-/**
- * GMarkupParseContext:
- *
- * A parse context is used to parse a stream of bytes that
- * you expect to contain marked-up text.
- *
- * See g_markup_parse_context_new(), #GMarkupParser, and so
- * on for more details.
- */
-typedef struct _GMarkupParseContext GMarkupParseContext;
-typedef struct _GMarkupParser GMarkupParser;
-
-/**
- * GMarkupParser:
- * @start_element: Callback to invoke when the opening tag of an element
- *     is seen.
- * @end_element: Callback to invoke when the closing tag of an element
- *     is seen. Note that this is also called for empty tags like
- *     <literal>&lt;empty/&gt;</literal>.
- * @text: Callback to invoke when some text is seen (text is always
- *     inside an element). Note that the text of an element may be spread
- *     over multiple calls of this function. If the
- *     %G_MARKUP_TREAT_CDATA_AS_TEXT flag is set, this function is also
- *     called for the content of CDATA marked sections.
- * @passthrough: Callback to invoke for comments, processing instructions
- *     and doctype declarations; if you're re-writing the parsed document,
- *     write the passthrough text back out in the same position. If the
- *     %G_MARKUP_TREAT_CDATA_AS_TEXT flag is not set, this function is also
- *     called for CDATA marked sections.
- * @error: Callback to invoke when an error occurs.
- *
- * Any of the fields in #GMarkupParser can be %NULL, in which case they
- * will be ignored. Except for the @error function, any of these callbacks
- * can set an error; in particular the %G_MARKUP_ERROR_UNKNOWN_ELEMENT,
- * %G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, and %G_MARKUP_ERROR_INVALID_CONTENT
- * errors are intended to be set from these callbacks. If you set an error
- * from a callback, g_markup_parse_context_parse() will report that error
- * back to its caller.
- */
-struct _GMarkupParser
-{
-  /* Called for open tags <foo bar="baz"> */
-  void (*start_element)  (GMarkupParseContext *context,
-                          const gchar         *element_name,
-                          const gchar        **attribute_names,
-                          const gchar        **attribute_values,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for close tags </foo> */
-  void (*end_element)    (GMarkupParseContext *context,
-                          const gchar         *element_name,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for character data */
-  /* text is not nul-terminated */
-  void (*text)           (GMarkupParseContext *context,
-                          const gchar         *text,
-                          gsize                text_len,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for strings that should be re-saved verbatim in this same
-   * position, but are not otherwise interpretable.  At the moment
-   * this includes comments and processing instructions.
-   */
-  /* text is not nul-terminated. */
-  void (*passthrough)    (GMarkupParseContext *context,
-                          const gchar         *passthrough_text,
-                          gsize                text_len,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called on error, including one set by other
-   * methods in the vtable. The GError should not be freed.
-   */
-  void (*error)          (GMarkupParseContext *context,
-                          GError              *error,
-                          gpointer             user_data);
-};
-
-GLIB_AVAILABLE_IN_ALL
-GMarkupParseContext *g_markup_parse_context_new   (const GMarkupParser *parser,
-                                                   GMarkupParseFlags    flags,
-                                                   gpointer             user_data,
-                                                   GDestroyNotify       user_data_dnotify);
-GLIB_AVAILABLE_IN_2_36
-GMarkupParseContext *g_markup_parse_context_ref   (GMarkupParseContext *context);
-GLIB_AVAILABLE_IN_2_36
-void                 g_markup_parse_context_unref (GMarkupParseContext *context);
-GLIB_AVAILABLE_IN_ALL
-void                 g_markup_parse_context_free  (GMarkupParseContext *context);
-GLIB_AVAILABLE_IN_ALL
-gboolean             g_markup_parse_context_parse (GMarkupParseContext *context,
-                                                   const gchar         *text,
-                                                   gssize               text_len,
-                                                   GError             **error);
-GLIB_AVAILABLE_IN_ALL
-void                 g_markup_parse_context_push  (GMarkupParseContext *context,
-                                                   const GMarkupParser *parser,
-                                                   gpointer             user_data);
-GLIB_AVAILABLE_IN_ALL
-gpointer             g_markup_parse_context_pop   (GMarkupParseContext *context);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean             g_markup_parse_context_end_parse (GMarkupParseContext *context,
-                                                       GError             **error);
-GLIB_AVAILABLE_IN_ALL
-const gchar *        g_markup_parse_context_get_element (GMarkupParseContext *context);
-GLIB_AVAILABLE_IN_ALL
-const GSList *       g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
-
-/* For user-constructed error messages, has no precise semantics */
-GLIB_AVAILABLE_IN_ALL
-void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
-                                                          gint                *line_number,
-                                                          gint                *char_number);
-GLIB_AVAILABLE_IN_ALL
-gpointer             g_markup_parse_context_get_user_data (GMarkupParseContext *context);
-
-/* useful when saving */
-GLIB_AVAILABLE_IN_ALL
-gchar* g_markup_escape_text (const gchar *text,
-                             gssize       length);
-
-GLIB_AVAILABLE_IN_ALL
-gchar *g_markup_printf_escaped (const char *format,
-				...) G_GNUC_PRINTF (1, 2);
-GLIB_AVAILABLE_IN_ALL
-gchar *g_markup_vprintf_escaped (const char *format,
-				 va_list     args) G_GNUC_PRINTF(1, 0);
-
-typedef enum
-{
-  G_MARKUP_COLLECT_INVALID,
-  G_MARKUP_COLLECT_STRING,
-  G_MARKUP_COLLECT_STRDUP,
-  G_MARKUP_COLLECT_BOOLEAN,
-  G_MARKUP_COLLECT_TRISTATE,
-
-  G_MARKUP_COLLECT_OPTIONAL = (1 << 16)
-} GMarkupCollectType;
-
-
-/* useful from start_element */
-GLIB_AVAILABLE_IN_ALL
-gboolean   g_markup_collect_attributes (const gchar         *element_name,
-                                        const gchar        **attribute_names,
-                                        const gchar        **attribute_values,
-                                        GError             **error,
-                                        GMarkupCollectType   first_type,
-                                        const gchar         *first_attr,
-                                        ...);
-
-G_END_DECLS
-
-#endif /* __G_MARKUP_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gmem.h b/linux-x86/include/glib-2.0/glib/gmem.h
deleted file mode 100644
index 8795b67..0000000
--- a/linux-x86/include/glib-2.0/glib/gmem.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_MEM_H__
-#define __G_MEM_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GMemVTable:
- * @malloc: function to use for allocating memory.
- * @realloc: function to use for reallocating memory.
- * @free: function to use to free memory.
- * @calloc: function to use for allocating zero-filled memory.
- * @try_malloc: function to use for allocating memory without a default error handler.
- * @try_realloc: function to use for reallocating memory without a default error handler.
- * 
- * A set of functions used to perform memory allocation. The same #GMemVTable must
- * be used for all allocations in the same program; a call to g_mem_set_vtable(),
- * if it exists, should be prior to any use of GLib.
- */
-typedef struct _GMemVTable GMemVTable;
-
-
-#if GLIB_SIZEOF_VOID_P > GLIB_SIZEOF_LONG
-/**
- * G_MEM_ALIGN:
- *
- * Indicates the number of bytes to which memory will be aligned on the
- * current platform.
- */
-#  define G_MEM_ALIGN	GLIB_SIZEOF_VOID_P
-#else	/* GLIB_SIZEOF_VOID_P <= GLIB_SIZEOF_LONG */
-#  define G_MEM_ALIGN	GLIB_SIZEOF_LONG
-#endif	/* GLIB_SIZEOF_VOID_P <= GLIB_SIZEOF_LONG */
-
-
-/* Memory allocation functions
- */
-
-GLIB_AVAILABLE_IN_ALL
-void	 g_free	          (gpointer	 mem);
-
-GLIB_AVAILABLE_IN_2_34
-void     g_clear_pointer  (gpointer      *pp,
-                           GDestroyNotify destroy);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer g_malloc         (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_malloc0        (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_realloc        (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-gpointer g_try_malloc     (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_try_malloc0    (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_try_realloc    (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-
-GLIB_AVAILABLE_IN_ALL
-gpointer g_malloc_n       (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_malloc0_n      (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_realloc_n      (gpointer	 mem,
-			   gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-gpointer g_try_malloc_n   (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_try_malloc0_n  (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_try_realloc_n  (gpointer	 mem,
-			   gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
-
-#define g_clear_pointer(pp, destroy) \
-  G_STMT_START {                                                               \
-    G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer));                       \
-    /* Only one access, please */                                              \
-    gpointer *_pp = (gpointer *) (pp);                                         \
-    gpointer _p;                                                               \
-    /* This assignment is needed to avoid a gcc warning */                     \
-    GDestroyNotify _destroy = (GDestroyNotify) (destroy);                      \
-                                                                               \
-    (void) (0 ? (gpointer) *(pp) : 0);                                         \
-    do                                                                         \
-      _p = g_atomic_pointer_get (_pp);                                         \
-    while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \
-                                                                               \
-    if (_p)                                                                    \
-      _destroy (_p);                                                           \
-  } G_STMT_END
-
-/* Optimise: avoid the call to the (slower) _n function if we can
- * determine at compile-time that no overflow happens.
- */
-#if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
-#  define _G_NEW(struct_type, n_structs, func) \
-	(struct_type *) (G_GNUC_EXTENSION ({			\
-	  gsize __n = (gsize) (n_structs);			\
-	  gsize __s = sizeof (struct_type);			\
-	  gpointer __p;						\
-	  if (__s == 1)						\
-	    __p = g_##func (__n);				\
-	  else if (__builtin_constant_p (__n) &&		\
-	           (__s == 0 || __n <= G_MAXSIZE / __s))	\
-	    __p = g_##func (__n * __s);				\
-	  else							\
-	    __p = g_##func##_n (__n, __s);			\
-	  __p;							\
-	}))
-#  define _G_RENEW(struct_type, mem, n_structs, func) \
-	(struct_type *) (G_GNUC_EXTENSION ({			\
-	  gsize __n = (gsize) (n_structs);			\
-	  gsize __s = sizeof (struct_type);			\
-	  gpointer __p = (gpointer) (mem);			\
-	  if (__s == 1)						\
-	    __p = g_##func (__p, __n);				\
-	  else if (__builtin_constant_p (__n) &&		\
-	           (__s == 0 || __n <= G_MAXSIZE / __s))	\
-	    __p = g_##func (__p, __n * __s);			\
-	  else							\
-	    __p = g_##func##_n (__p, __n, __s);			\
-	  __p;							\
-	}))
-
-#else
-
-/* Unoptimised version: always call the _n() function. */
-
-#define _G_NEW(struct_type, n_structs, func) \
-        ((struct_type *) g_##func##_n ((n_structs), sizeof (struct_type)))
-#define _G_RENEW(struct_type, mem, n_structs, func) \
-        ((struct_type *) g_##func##_n (mem, (n_structs), sizeof (struct_type)))
-
-#endif
-
-/**
- * g_new:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Allocates @n_structs elements of type @struct_type.
- * The returned pointer is cast to a pointer to the given type.
- * If @n_structs is 0 it returns %NULL.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Since the returned pointer is already casted to the right type,
- * it is normally unnecessary to cast it explicitly, and doing
- * so might hide memory allocation errors.
- * 
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_new(struct_type, n_structs)			_G_NEW (struct_type, n_structs, malloc)
-/**
- * g_new0:
- * @struct_type: the type of the elements to allocate.
- * @n_structs: the number of elements to allocate.
- * 
- * Allocates @n_structs elements of type @struct_type, initialized to 0's.
- * The returned pointer is cast to a pointer to the given type.
- * If @n_structs is 0 it returns %NULL.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Since the returned pointer is already casted to the right type,
- * it is normally unnecessary to cast it explicitly, and doing
- * so might hide memory allocation errors.
- * 
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type.
- */
-#define g_new0(struct_type, n_structs)			_G_NEW (struct_type, n_structs, malloc0)
-/**
- * g_renew:
- * @struct_type: the type of the elements to allocate
- * @mem: the currently allocated memory
- * @n_structs: the number of elements to allocate
- * 
- * Reallocates the memory pointed to by @mem, so that it now has space for
- * @n_structs elements of type @struct_type. It returns the new address of
- * the memory, which may have been moved.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Returns: a pointer to the new allocated memory, cast to a pointer to @struct_type
- */
-#define g_renew(struct_type, mem, n_structs)		_G_RENEW (struct_type, mem, n_structs, realloc)
-/**
- * g_try_new:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to allocate @n_structs elements of type @struct_type, and returns
- * %NULL on failure. Contrast with g_new(), which aborts the program on failure.
- * The returned pointer is cast to a pointer to the given type.
- * The function returns %NULL when @n_structs is 0 of if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_new(struct_type, n_structs)		_G_NEW (struct_type, n_structs, try_malloc)
-/**
- * g_try_new0:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to allocate @n_structs elements of type @struct_type, initialized
- * to 0's, and returns %NULL on failure. Contrast with g_new0(), which aborts
- * the program on failure.
- * The returned pointer is cast to a pointer to the given type.
- * The function returns %NULL when @n_structs is 0 of if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_new0(struct_type, n_structs)		_G_NEW (struct_type, n_structs, try_malloc0)
-/**
- * g_try_renew:
- * @struct_type: the type of the elements to allocate
- * @mem: the currently allocated memory
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to reallocate the memory pointed to by @mem, so that it now has
- * space for @n_structs elements of type @struct_type, and returns %NULL on
- * failure. Contrast with g_renew(), which aborts the program on failure.
- * It returns the new address of the memory, which may have been moved.
- * The function returns %NULL if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the new allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_renew(struct_type, mem, n_structs)	_G_RENEW (struct_type, mem, n_structs, try_realloc)
-
-
-/* Memory allocation virtualization for debugging purposes
- * g_mem_set_vtable() has to be the very first GLib function called
- * if being used
- */
-struct _GMemVTable {
-  gpointer (*malloc)      (gsize    n_bytes);
-  gpointer (*realloc)     (gpointer mem,
-			   gsize    n_bytes);
-  void     (*free)        (gpointer mem);
-  /* optional; set to NULL if not used ! */
-  gpointer (*calloc)      (gsize    n_blocks,
-			   gsize    n_block_bytes);
-  gpointer (*try_malloc)  (gsize    n_bytes);
-  gpointer (*try_realloc) (gpointer mem,
-			   gsize    n_bytes);
-};
-GLIB_AVAILABLE_IN_ALL
-void	 g_mem_set_vtable (GMemVTable	*vtable);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_mem_is_system_malloc (void);
-
-GLIB_VAR gboolean g_mem_gc_friendly;
-
-/* Memory profiler and checker, has to be enabled via g_mem_set_vtable()
- */
-GLIB_VAR GMemVTable	*glib_mem_profiler_table;
-GLIB_AVAILABLE_IN_ALL
-void	g_mem_profile	(void);
-
-G_END_DECLS
-
-#endif /* __G_MEM_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gmessages.h b/linux-x86/include/glib-2.0/glib/gmessages.h
deleted file mode 100644
index 77958ad..0000000
--- a/linux-x86/include/glib-2.0/glib/gmessages.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_MESSAGES_H__
-#define __G_MESSAGES_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <stdarg.h>
-#include <glib/gtypes.h>
-#include <glib/gmacros.h>
-
-/* Suppress warnings when GCC is in -pedantic mode and not -std=c99
- */
-#if (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
-#pragma GCC system_header
-#endif
-
-G_BEGIN_DECLS
-
-/* calculate a string size, guaranteed to fit format + args.
- */
-GLIB_AVAILABLE_IN_ALL
-gsize	g_printf_string_upper_bound (const gchar* format,
-				     va_list	  args) G_GNUC_PRINTF(1, 0);
-
-/* Log level shift offset for user defined
- * log levels (0-7 are used by GLib).
- */
-#define G_LOG_LEVEL_USER_SHIFT  (8)
-
-/* Glib log levels and flags.
- */
-typedef enum
-{
-  /* log flags */
-  G_LOG_FLAG_RECURSION          = 1 << 0,
-  G_LOG_FLAG_FATAL              = 1 << 1,
-
-  /* GLib log levels */
-  G_LOG_LEVEL_ERROR             = 1 << 2,       /* always fatal */
-  G_LOG_LEVEL_CRITICAL          = 1 << 3,
-  G_LOG_LEVEL_WARNING           = 1 << 4,
-  G_LOG_LEVEL_MESSAGE           = 1 << 5,
-  G_LOG_LEVEL_INFO              = 1 << 6,
-  G_LOG_LEVEL_DEBUG             = 1 << 7,
-
-  G_LOG_LEVEL_MASK              = ~(G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL)
-} GLogLevelFlags;
-
-/* GLib log levels that are considered fatal by default */
-#define G_LOG_FATAL_MASK        (G_LOG_FLAG_RECURSION | G_LOG_LEVEL_ERROR)
-
-typedef void            (*GLogFunc)             (const gchar   *log_domain,
-                                                 GLogLevelFlags log_level,
-                                                 const gchar   *message,
-                                                 gpointer       user_data);
-
-/* Logging mechanism
- */
-GLIB_AVAILABLE_IN_ALL
-guint           g_log_set_handler       (const gchar    *log_domain,
-                                         GLogLevelFlags  log_levels,
-                                         GLogFunc        log_func,
-                                         gpointer        user_data);
-GLIB_AVAILABLE_IN_ALL
-void            g_log_remove_handler    (const gchar    *log_domain,
-                                         guint           handler_id);
-GLIB_AVAILABLE_IN_ALL
-void            g_log_default_handler   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *message,
-                                         gpointer        unused_data);
-GLIB_AVAILABLE_IN_ALL
-GLogFunc        g_log_set_default_handler (GLogFunc      log_func,
-					   gpointer      user_data);
-GLIB_AVAILABLE_IN_ALL
-void            g_log                   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         ...) G_GNUC_PRINTF (3, 4);
-GLIB_AVAILABLE_IN_ALL
-void            g_logv                  (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         va_list         args) G_GNUC_PRINTF(3, 0);
-GLIB_AVAILABLE_IN_ALL
-GLogLevelFlags  g_log_set_fatal_mask    (const gchar    *log_domain,
-                                         GLogLevelFlags  fatal_mask);
-GLIB_AVAILABLE_IN_ALL
-GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
-
-/* internal */
-void	_g_log_fallback_handler	(const gchar   *log_domain,
-						 GLogLevelFlags log_level,
-						 const gchar   *message,
-						 gpointer       unused_data);
-
-/* Internal functions, used to implement the following macros */
-GLIB_AVAILABLE_IN_ALL
-void g_return_if_fail_warning (const char *log_domain,
-			       const char *pretty_function,
-			       const char *expression) G_ANALYZER_NORETURN;
-GLIB_AVAILABLE_IN_ALL
-void g_warn_message           (const char     *domain,
-                               const char     *file,
-                               int             line,
-                               const char     *func,
-                               const char     *warnexpr) G_ANALYZER_NORETURN;
-GLIB_DEPRECATED
-void g_assert_warning         (const char *log_domain,
-			       const char *file,
-			       const int   line,
-		               const char *pretty_function,
-		               const char *expression) G_GNUC_NORETURN;
-
-
-#ifndef G_LOG_DOMAIN
-#define G_LOG_DOMAIN    ((gchar*) 0)
-#endif  /* G_LOG_DOMAIN */
-
-#if defined(G_HAVE_ISO_VARARGS) && !G_ANALYZER_ANALYZING
-/* for(;;) ; so that GCC knows that control doesn't go past g_error().
- * Put space before ending semicolon to avoid C++ build warnings.
- */
-#define g_error(...)  G_STMT_START {                 \
-                        g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_ERROR,    \
-                               __VA_ARGS__);         \
-                        for (;;) ;                   \
-                      } G_STMT_END
-                        
-#define g_message(...)  g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_MESSAGE,  \
-                               __VA_ARGS__)
-#define g_critical(...) g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_CRITICAL, \
-                               __VA_ARGS__)
-#define g_warning(...)  g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_WARNING,  \
-                               __VA_ARGS__)
-#define g_debug(...)    g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_DEBUG,    \
-                               __VA_ARGS__)
-#elif defined(G_HAVE_GNUC_VARARGS)  && !G_ANALYZER_ANALYZING
-#define g_error(format...)    G_STMT_START {                 \
-                                g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_ERROR,    \
-                                       format);              \
-                                for (;;) ;                   \
-                              } G_STMT_END
-                              
-#define g_message(format...)    g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_MESSAGE,  \
-                                       format)
-#define g_critical(format...)   g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_CRITICAL, \
-                                       format)
-#define g_warning(format...)    g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_WARNING,  \
-                                       format)
-#define g_debug(format...)      g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_DEBUG,    \
-                                       format)
-#else   /* no varargs macros */
-static void g_error (const gchar *format, ...) G_ANALYZER_NORETURN;
-static void g_critical (const gchar *format, ...) G_ANALYZER_NORETURN;
-
-static void
-g_error (const gchar *format,
-         ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
-  va_end (args);
-
-  for(;;) ;
-}
-static void
-g_message (const gchar *format,
-           ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, format, args);
-  va_end (args);
-}
-static void
-g_critical (const gchar *format,
-            ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, format, args);
-  va_end (args);
-}
-static void
-g_warning (const gchar *format,
-           ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, format, args);
-  va_end (args);
-}
-static void
-g_debug (const gchar *format,
-         ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args);
-  va_end (args);
-}
-#endif  /* !__GNUC__ */
-
-/**
- * GPrintFunc:
- * @string: the message to output
- *
- * Specifies the type of the print handler functions.
- * These are called with the complete formatted string to output.
- */
-typedef void    (*GPrintFunc)           (const gchar    *string);
-GLIB_AVAILABLE_IN_ALL
-void            g_print                 (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GLIB_AVAILABLE_IN_ALL
-GPrintFunc      g_set_print_handler     (GPrintFunc      func);
-GLIB_AVAILABLE_IN_ALL
-void            g_printerr              (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GLIB_AVAILABLE_IN_ALL
-GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
-
-/**
- * g_warn_if_reached:
- *
- * Logs a critical warning.
- *
- * Since: 2.16
- */
-#define g_warn_if_reached() \
-  do { \
-    g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, NULL); \
-  } while (0)
-
-/**
- * g_warn_if_fail:
- * @expr: the expression to check
- *
- * Logs a warning if the expression is not true.
- *
- * Since: 2.16
- */
-#define g_warn_if_fail(expr) \
-  do { \
-    if G_LIKELY (expr) ; \
-    else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, #expr); \
-  } while (0)
-
-#ifdef G_DISABLE_CHECKS
-
-/**
- * g_return_if_fail:
- * @expr: the expression to check
- *
- * Verifies that the expression evaluates to %TRUE.  If the expression
- * evaluates to %FALSE, a critical message is logged and the current
- * function returns.  This can only be used in functions which do not
- * return a value.
- *
- * If G_DISABLE_CHECKS is defined then the check is not performed.  You
- * should therefore not depend on any side effects of @expr.
- */
-#define g_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END
-
-/**
- * g_return_val_if_fail:
- * @expr: the expression to check
- * @val: the value to return from the current function
- *       if the expression is not true
- *
- * Verifies that the expression evaluates to %TRUE.  If the expression
- * evaluates to %FALSE, a critical message is logged and @val is
- * returned from the current function.
- *
- * If G_DISABLE_CHECKS is defined then the check is not performed.  You
- * should therefore not depend on any side effects of @expr.
- */
-#define g_return_val_if_fail(expr,val) G_STMT_START{ (void)0; }G_STMT_END
-
-/**
- * g_return_if_reached:
- *
- * Logs a critical message and returns from the current function.
- * This can only be used in functions which do not return a value.
- */
-#define g_return_if_reached() G_STMT_START{ return; }G_STMT_END
-
-/**
- * g_return_val_if_reached:
- * @val: the value to return from the current function
- *
- * Logs a critical message and returns @val.
- */
-#define g_return_val_if_reached(val) G_STMT_START{ return (val); }G_STMT_END
-
-#else /* !G_DISABLE_CHECKS */
-
-#ifdef __GNUC__
-
-#define g_return_if_fail(expr)		G_STMT_START{			\
-     if G_LIKELY(expr) { } else       					\
-       {								\
-	 g_return_if_fail_warning (G_LOG_DOMAIN,			\
-		                   __PRETTY_FUNCTION__,		        \
-		                   #expr);				\
-	 return;							\
-       };				}G_STMT_END
-
-#define g_return_val_if_fail(expr,val)	G_STMT_START{			\
-     if G_LIKELY(expr) { } else						\
-       {								\
-	 g_return_if_fail_warning (G_LOG_DOMAIN,			\
-		                   __PRETTY_FUNCTION__,		        \
-		                   #expr);				\
-	 return (val);							\
-       };				}G_STMT_END
-
-#define g_return_if_reached()		G_STMT_START{			\
-     g_log (G_LOG_DOMAIN,						\
-	    G_LOG_LEVEL_CRITICAL,					\
-	    "file %s: line %d (%s): should not be reached",		\
-	    __FILE__,							\
-	    __LINE__,							\
-	    __PRETTY_FUNCTION__);					\
-     return;				}G_STMT_END
-
-#define g_return_val_if_reached(val)	G_STMT_START{			\
-     g_log (G_LOG_DOMAIN,						\
-	    G_LOG_LEVEL_CRITICAL,					\
-	    "file %s: line %d (%s): should not be reached",		\
-	    __FILE__,							\
-	    __LINE__,							\
-	    __PRETTY_FUNCTION__);					\
-     return (val);			}G_STMT_END
-
-#else /* !__GNUC__ */
-
-#define g_return_if_fail(expr)		G_STMT_START{		\
-     if (expr) { } else						\
-       {							\
-	 g_log (G_LOG_DOMAIN,					\
-		G_LOG_LEVEL_CRITICAL,				\
-		"file %s: line %d: assertion '%s' failed",	\
-		__FILE__,					\
-		__LINE__,					\
-		#expr);						\
-	 return;						\
-       };				}G_STMT_END
-
-#define g_return_val_if_fail(expr, val)	G_STMT_START{		\
-     if (expr) { } else						\
-       {							\
-	 g_log (G_LOG_DOMAIN,					\
-		G_LOG_LEVEL_CRITICAL,				\
-		"file %s: line %d: assertion '%s' failed",	\
-		__FILE__,					\
-		__LINE__,					\
-		#expr);						\
-	 return (val);						\
-       };				}G_STMT_END
-
-#define g_return_if_reached()		G_STMT_START{		\
-     g_log (G_LOG_DOMAIN,					\
-	    G_LOG_LEVEL_CRITICAL,				\
-	    "file %s: line %d: should not be reached",		\
-	    __FILE__,						\
-	    __LINE__);						\
-     return;				}G_STMT_END
-
-#define g_return_val_if_reached(val)	G_STMT_START{		\
-     g_log (G_LOG_DOMAIN,					\
-	    G_LOG_LEVEL_CRITICAL,				\
-	    "file %s: line %d: should not be reached",		\
-	    __FILE__,						\
-	    __LINE__);						\
-     return (val);			}G_STMT_END
-
-#endif /* !__GNUC__ */
-
-#endif /* !G_DISABLE_CHECKS */
-
-G_END_DECLS
-
-#endif /* __G_MESSAGES_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gnode.h b/linux-x86/include/glib-2.0/glib/gnode.h
deleted file mode 100644
index 71f60ab..0000000
--- a/linux-x86/include/glib-2.0/glib/gnode.h
+++ /dev/null
@@ -1,324 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_NODE_H__
-#define __G_NODE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GNode		GNode;
-
-/* Tree traverse flags */
-typedef enum
-{
-  G_TRAVERSE_LEAVES     = 1 << 0,
-  G_TRAVERSE_NON_LEAVES = 1 << 1,
-  G_TRAVERSE_ALL        = G_TRAVERSE_LEAVES | G_TRAVERSE_NON_LEAVES,
-  G_TRAVERSE_MASK       = 0x03,
-  G_TRAVERSE_LEAFS      = G_TRAVERSE_LEAVES,
-  G_TRAVERSE_NON_LEAFS  = G_TRAVERSE_NON_LEAVES
-} GTraverseFlags;
-
-/* Tree traverse orders */
-typedef enum
-{
-  G_IN_ORDER,
-  G_PRE_ORDER,
-  G_POST_ORDER,
-  G_LEVEL_ORDER
-} GTraverseType;
-
-typedef gboolean	(*GNodeTraverseFunc)	(GNode	       *node,
-						 gpointer	data);
-typedef void		(*GNodeForeachFunc)	(GNode	       *node,
-						 gpointer	data);
-
-/**
- * GCopyFunc:
- * @src: A pointer to the data which should be copied
- * @data: Additional data
- *
- * A function of this signature is used to copy the node data 
- * when doing a deep-copy of a tree.
- *
- * Returns: A pointer to the copy
- *
- * Since: 2.4
- */
-typedef gpointer	(*GCopyFunc)            (gconstpointer  src,
-                                                 gpointer       data);
-
-/* N-way tree implementation
- */
-struct _GNode
-{
-  gpointer data;
-  GNode	  *next;
-  GNode	  *prev;
-  GNode	  *parent;
-  GNode	  *children;
-};
-
-/**
- * G_NODE_IS_ROOT:
- * @node: a #GNode
- *
- * Returns %TRUE if a #GNode is the root of a tree.
- *
- * Returns: %TRUE if the #GNode is the root of a tree 
- *     (i.e. it has no parent or siblings)
- */
-#define	 G_NODE_IS_ROOT(node)	(((GNode*) (node))->parent == NULL && \
-				 ((GNode*) (node))->prev == NULL && \
-				 ((GNode*) (node))->next == NULL)
-
-/**
- * G_NODE_IS_LEAF:
- * @node: a #GNode
- *
- * Returns %TRUE if a #GNode is a leaf node.
- *
- * Returns: %TRUE if the #GNode is a leaf node 
- *     (i.e. it has no children)
- */
-#define	 G_NODE_IS_LEAF(node)	(((GNode*) (node))->children == NULL)
-
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_new		(gpointer	   data);
-GLIB_AVAILABLE_IN_ALL
-void	 g_node_destroy		(GNode		  *root);
-GLIB_AVAILABLE_IN_ALL
-void	 g_node_unlink		(GNode		  *node);
-GLIB_AVAILABLE_IN_ALL
-GNode*   g_node_copy_deep       (GNode            *node,
-				 GCopyFunc         copy_func,
-				 gpointer          data);
-GLIB_AVAILABLE_IN_ALL
-GNode*   g_node_copy            (GNode            *node);
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_insert		(GNode		  *parent,
-				 gint		   position,
-				 GNode		  *node);
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_insert_before	(GNode		  *parent,
-				 GNode		  *sibling,
-				 GNode		  *node);
-GLIB_AVAILABLE_IN_ALL
-GNode*   g_node_insert_after    (GNode            *parent,
-				 GNode            *sibling,
-				 GNode            *node); 
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_prepend		(GNode		  *parent,
-				 GNode		  *node);
-GLIB_AVAILABLE_IN_ALL
-guint	 g_node_n_nodes		(GNode		  *root,
-				 GTraverseFlags	   flags);
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_get_root	(GNode		  *node);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_node_is_ancestor	(GNode		  *node,
-				 GNode		  *descendant);
-GLIB_AVAILABLE_IN_ALL
-guint	 g_node_depth		(GNode		  *node);
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_find		(GNode		  *root,
-				 GTraverseType	   order,
-				 GTraverseFlags	   flags,
-				 gpointer	   data);
-
-/* convenience macros */
-/**
- * g_node_append:
- * @parent: the #GNode to place the new #GNode under
- * @node: the #GNode to insert
- *
- * Inserts a #GNode as the last child of the given parent.
- *
- * Returns: the inserted #GNode
- */
-#define g_node_append(parent, node)				\
-     g_node_insert_before ((parent), NULL, (node))
-
-/**
- * g_node_insert_data:
- * @parent: the #GNode to place the new #GNode under
- * @position: the position to place the new #GNode at. If position is -1, 
- *     the new #GNode is inserted as the last child of @parent
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode at the given position.
- *
- * Returns: the new #GNode
- */
-#define	g_node_insert_data(parent, position, data)		\
-     g_node_insert ((parent), (position), g_node_new (data))
-
-/**
- * g_node_insert_data_after:
- * @parent: the #GNode to place the new #GNode under
- * @sibling: the sibling #GNode to place the new #GNode after
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode after the given sibling.
- *
- * Returns: the new #GNode
- */
-
-#define	g_node_insert_data_after(parent, sibling, data)	\
-     g_node_insert_after ((parent), (sibling), g_node_new (data))
-/**
- * g_node_insert_data_before:
- * @parent: the #GNode to place the new #GNode under
- * @sibling: the sibling #GNode to place the new #GNode before
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode before the given sibling.
- *
- * Returns: the new #GNode
- */
-#define	g_node_insert_data_before(parent, sibling, data)	\
-     g_node_insert_before ((parent), (sibling), g_node_new (data))
-
-/**
- * g_node_prepend_data:
- * @parent: the #GNode to place the new #GNode under
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode as the first child of the given parent.
- *
- * Returns: the new #GNode
- */
-#define	g_node_prepend_data(parent, data)			\
-     g_node_prepend ((parent), g_node_new (data))
-
-/**
- * g_node_append_data:
- * @parent: the #GNode to place the new #GNode under
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode as the last child of the given parent.
- *
- * Returns: the new #GNode
- */
-#define	g_node_append_data(parent, data)			\
-     g_node_insert_before ((parent), NULL, g_node_new (data))
-
-/* traversal function, assumes that 'node' is root
- * (only traverses 'node' and its subtree).
- * this function is just a high level interface to
- * low level traversal functions, optimized for speed.
- */
-GLIB_AVAILABLE_IN_ALL
-void	 g_node_traverse	(GNode		  *root,
-				 GTraverseType	   order,
-				 GTraverseFlags	   flags,
-				 gint		   max_depth,
-				 GNodeTraverseFunc func,
-				 gpointer	   data);
-
-/* return the maximum tree height starting with 'node', this is an expensive
- * operation, since we need to visit all nodes. this could be shortened by
- * adding 'guint height' to struct _GNode, but then again, this is not very
- * often needed, and would make g_node_insert() more time consuming.
- */
-GLIB_AVAILABLE_IN_ALL
-guint	 g_node_max_height	 (GNode *root);
-
-GLIB_AVAILABLE_IN_ALL
-void	 g_node_children_foreach (GNode		  *node,
-				  GTraverseFlags   flags,
-				  GNodeForeachFunc func,
-				  gpointer	   data);
-GLIB_AVAILABLE_IN_ALL
-void	 g_node_reverse_children (GNode		  *node);
-GLIB_AVAILABLE_IN_ALL
-guint	 g_node_n_children	 (GNode		  *node);
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_nth_child	 (GNode		  *node,
-				  guint		   n);
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_last_child	 (GNode		  *node);
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_find_child	 (GNode		  *node,
-				  GTraverseFlags   flags,
-				  gpointer	   data);
-GLIB_AVAILABLE_IN_ALL
-gint	 g_node_child_position	 (GNode		  *node,
-				  GNode		  *child);
-GLIB_AVAILABLE_IN_ALL
-gint	 g_node_child_index	 (GNode		  *node,
-				  gpointer	   data);
-
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_first_sibling	 (GNode		  *node);
-GLIB_AVAILABLE_IN_ALL
-GNode*	 g_node_last_sibling	 (GNode		  *node);
-
-/**
- * g_node_prev_sibling:
- * @node: a #GNode
- *
- * Gets the previous sibling of a #GNode.
- *
- * Returns: the previous sibling of @node, or %NULL if @node is the first
- *     node or %NULL
- */
-#define	 g_node_prev_sibling(node)	((node) ? \
-					 ((GNode*) (node))->prev : NULL)
-
-/**
- * g_node_next_sibling:
- * @node: a #GNode
- *
- * Gets the next sibling of a #GNode.
- *
- * Returns: the next sibling of @node, or %NULL if @node is the last node
- *     or %NULL
- */
-#define	 g_node_next_sibling(node)	((node) ? \
-					 ((GNode*) (node))->next : NULL)
-
-/**
- * g_node_first_child:
- * @node: a #GNode
- *
- * Gets the first child of a #GNode.
- *
- * Returns: the first child of @node, or %NULL if @node is %NULL 
- *     or has no children
- */
-#define	 g_node_first_child(node)	((node) ? \
-					 ((GNode*) (node))->children : NULL)
-
-G_END_DECLS
-
-#endif /* __G_NODE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/goption.h b/linux-x86/include/glib-2.0/glib/goption.h
deleted file mode 100644
index ee01377..0000000
--- a/linux-x86/include/glib-2.0/glib/goption.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/* goption.h - Option parser
- *
- *  Copyright (C) 2004  Anders Carlsson <andersca@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_OPTION_H__
-#define __G_OPTION_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gerror.h>
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/**
- * GOptionContext:
- * 
- * A <structname>GOptionContext</structname> struct defines which options
- * are accepted by the commandline option parser. The struct has only private 
- * fields and should not be directly accessed.
- */
-typedef struct _GOptionContext GOptionContext;
-
-/**
- * GOptionGroup:
- *
- * A <structname>GOptionGroup</structname> struct defines the options in a single
- * group. The struct has only private fields and should not be directly accessed.
- *
- * All options in a group share the same translation function. Libraries which
- * need to parse commandline options are expected to provide a function for
- * getting a <structname>GOptionGroup</structname> holding their options, which
- * the application can then add to its #GOptionContext.
- */
-typedef struct _GOptionGroup   GOptionGroup;
-typedef struct _GOptionEntry   GOptionEntry;
-
-/**
- * GOptionFlags:
- * @G_OPTION_FLAG_HIDDEN: The option doesn't appear in <option>--help</option>
- *  output.
- * @G_OPTION_FLAG_IN_MAIN: The option appears in the main section of the
- *  <option>--help</option> output, even if it is defined in a group.
- * @G_OPTION_FLAG_REVERSE: For options of the %G_OPTION_ARG_NONE kind, this flag
- *  indicates that the sense of the option is reversed.
- * @G_OPTION_FLAG_NO_ARG: For options of the %G_OPTION_ARG_CALLBACK kind,
- *  this flag indicates that the callback does not take any argument
- *  (like a %G_OPTION_ARG_NONE option). Since 2.8
- * @G_OPTION_FLAG_FILENAME: For options of the %G_OPTION_ARG_CALLBACK
- *  kind, this flag indicates that the argument should be passed to the
- *  callback in the GLib filename encoding rather than UTF-8. Since 2.8
- * @G_OPTION_FLAG_OPTIONAL_ARG: For options of the %G_OPTION_ARG_CALLBACK 
- *  kind, this flag indicates that the argument supply is optional. If no argument
- *  is given then data of %GOptionParseFunc will be set to NULL. Since 2.8
- * @G_OPTION_FLAG_NOALIAS: This flag turns off the automatic conflict resolution
- *  which prefixes long option names with <literal>groupname-</literal> if 
- *  there is a conflict. This option should only be used in situations where
- *  aliasing is necessary to model some legacy commandline interface. It is
- *  not safe to use this option, unless all option groups are under your 
- *  direct control. Since 2.8.
- * 
- * Flags which modify individual options.
- */
-typedef enum
-{
-  G_OPTION_FLAG_HIDDEN		= 1 << 0,
-  G_OPTION_FLAG_IN_MAIN		= 1 << 1,
-  G_OPTION_FLAG_REVERSE		= 1 << 2,
-  G_OPTION_FLAG_NO_ARG		= 1 << 3,
-  G_OPTION_FLAG_FILENAME	= 1 << 4,
-  G_OPTION_FLAG_OPTIONAL_ARG    = 1 << 5,
-  G_OPTION_FLAG_NOALIAS	        = 1 << 6
-} GOptionFlags;
-
-/**
- * GOptionArg:
- * @G_OPTION_ARG_NONE: No extra argument. This is useful for simple flags.
- * @G_OPTION_ARG_STRING: The option takes a string argument.
- * @G_OPTION_ARG_INT: The option takes an integer argument.
- * @G_OPTION_ARG_CALLBACK: The option provides a callback to parse the
- *  extra argument.
- * @G_OPTION_ARG_FILENAME: The option takes a filename as argument.
- * @G_OPTION_ARG_STRING_ARRAY: The option takes a string argument, multiple
- *  uses of the option are collected into an array of strings.
- * @G_OPTION_ARG_FILENAME_ARRAY: The option takes a filename as argument, 
- *  multiple uses of the option are collected into an array of strings.
- * @G_OPTION_ARG_DOUBLE: The option takes a double argument. The argument
- *  can be formatted either for the user's locale or for the "C" locale. Since 2.12
- * @G_OPTION_ARG_INT64: The option takes a 64-bit integer. Like %G_OPTION_ARG_INT
- *  but for larger numbers. The number can be in decimal base, or in hexadecimal
- *  (when prefixed with <literal>0x</literal>, for example, <literal>0xffffffff</literal>).
- *  Since 2.12
- * 
- * The #GOptionArg enum values determine which type of extra argument the
- * options expect to find. If an option expects an extra argument, it
- * can be specified in several ways; with a short option:
- * <option>-x arg</option>, with a long option: <option>--name arg</option>
- * or combined in a single argument: <option>--name=arg</option>.
- */
-typedef enum
-{
-  G_OPTION_ARG_NONE,
-  G_OPTION_ARG_STRING,
-  G_OPTION_ARG_INT,
-  G_OPTION_ARG_CALLBACK,
-  G_OPTION_ARG_FILENAME,
-  G_OPTION_ARG_STRING_ARRAY,
-  G_OPTION_ARG_FILENAME_ARRAY,
-  G_OPTION_ARG_DOUBLE,
-  G_OPTION_ARG_INT64
-} GOptionArg;
-
-/**
- * GOptionArgFunc:
- * @option_name: The name of the option being parsed. This will be either a 
- *  single dash followed by a single letter (for a short name) or two dashes
- *  followed by a long option name.
- * @value: The value to be parsed.
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: A return location for errors. The error code %G_OPTION_ERROR_FAILED
- *  is intended to be used for errors in #GOptionArgFunc callbacks.
- * 
- * The type of function to be passed as callback for %G_OPTION_ARG_CALLBACK
- * options.
- * 
- * Returns: %TRUE if the option was successfully parsed, %FALSE if an error 
- *  occurred, in which case @error should be set with g_set_error()
- */
-typedef gboolean (*GOptionArgFunc) (const gchar    *option_name,
-				    const gchar    *value,
-				    gpointer        data,
-				    GError        **error);
-
-/**
- * GOptionParseFunc:
- * @context: The active #GOptionContext
- * @group: The group to which the function belongs
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: A return location for error details
- * 
- * The type of function that can be called before and after parsing. 
- * 
- * Returns: %TRUE if the function completed successfully, %FALSE if an error 
- *  occurred, in which case @error should be set with g_set_error()
- */
-typedef gboolean (*GOptionParseFunc) (GOptionContext *context,
-				      GOptionGroup   *group,
-				      gpointer	      data,
-				      GError        **error);
-
-/**
- * GOptionErrorFunc:
- * @context: The active #GOptionContext
- * @group: The group to which the function belongs
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: The #GError containing details about the parse error
- * 
- * The type of function to be used as callback when a parse error occurs.
- */
-typedef void (*GOptionErrorFunc) (GOptionContext *context,
-				  GOptionGroup   *group,
-				  gpointer        data,
-				  GError        **error);
-
-/**
- * G_OPTION_ERROR:
- * 
- * Error domain for option parsing. Errors in this domain will
- * be from the #GOptionError enumeration. See #GError for information on 
- * error domains.
- */
-#define G_OPTION_ERROR (g_option_error_quark ())
-
-/**
- * GOptionError:
- * @G_OPTION_ERROR_UNKNOWN_OPTION: An option was not known to the parser.
- *  This error will only be reported, if the parser hasn't been instructed
- *  to ignore unknown options, see g_option_context_set_ignore_unknown_options().
- * @G_OPTION_ERROR_BAD_VALUE: A value couldn't be parsed.
- * @G_OPTION_ERROR_FAILED: A #GOptionArgFunc callback failed.
- * 
- * Error codes returned by option parsing.
- */
-typedef enum
-{
-  G_OPTION_ERROR_UNKNOWN_OPTION,
-  G_OPTION_ERROR_BAD_VALUE,
-  G_OPTION_ERROR_FAILED
-} GOptionError;
-
-GLIB_AVAILABLE_IN_ALL
-GQuark g_option_error_quark (void);
-
-/**
- * GOptionEntry:
- * @long_name: The long name of an option can be used to specify it
- *  in a commandline as --<replaceable>long_name</replaceable>. Every
- *  option must have a long name. To resolve conflicts if multiple
- *  option groups contain the same long name, it is also possible to
- *  specify the option as 
- *  --<replaceable>groupname</replaceable>-<replaceable>long_name</replaceable>.
- * @short_name: If an option has a short name, it can be specified
- *  -<replaceable>short_name</replaceable> in a commandline. @short_name must be 
- *  a printable ASCII character different from '-', or zero if the option has no
- *  short name.
- * @flags: Flags from #GOptionFlags.
- * @arg: The type of the option, as a #GOptionArg.
- * @arg_data: If the @arg type is %G_OPTION_ARG_CALLBACK, then @arg_data must 
- *  point to a #GOptionArgFunc callback function, which will be called to handle 
- *  the extra argument. Otherwise, @arg_data is a pointer to a location to store 
- *  the value, the required type of the location depends on the @arg type:
- *  <variablelist>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_NONE</term>
- *  <listitem><para>%gboolean</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_STRING</term>
- *  <listitem><para>%gchar*</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_INT</term>
- *  <listitem><para>%gint</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_FILENAME</term>
- *  <listitem><para>%gchar*</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_STRING_ARRAY</term>
- *  <listitem><para>%gchar**</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_FILENAME_ARRAY</term>
- *  <listitem><para>%gchar**</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_DOUBLE</term>
- *  <listitem><para>%gdouble</para></listitem>
- *  </varlistentry>
- *  </variablelist>
- *  If @arg type is %G_OPTION_ARG_STRING or %G_OPTION_ARG_FILENAME the location
- *  will contain a newly allocated string if the option was given. That string
- *  needs to be freed by the callee using g_free(). Likewise if @arg type is
- *  %G_OPTION_ARG_STRING_ARRAY or %G_OPTION_ARG_FILENAME_ARRAY, the data should
- *  be freed using g_strfreev().
- * @description: the description for the option in <option>--help</option>
- *  output. The @description is translated using the @translate_func of the
- *  group, see g_option_group_set_translation_domain().
- * @arg_description: The placeholder to use for the extra argument parsed
- *  by the option in <option>--help</option>
- *  output. The @arg_description is translated using the @translate_func of the
- *  group, see g_option_group_set_translation_domain().
- * 
- * A <structname>GOptionEntry</structname> defines a single option.
- * To have an effect, they must be added to a #GOptionGroup with
- * g_option_context_add_main_entries() or g_option_group_add_entries().
- */
-struct _GOptionEntry
-{
-  const gchar *long_name;
-  gchar        short_name;
-  gint         flags;
-
-  GOptionArg   arg;
-  gpointer     arg_data;
-  
-  const gchar *description;
-  const gchar *arg_description;
-};
-
-/**
- * G_OPTION_REMAINING:
- * 
- * If a long option in the main group has this name, it is not treated as a 
- * regular option. Instead it collects all non-option arguments which would
- * otherwise be left in <literal>argv</literal>. The option must be of type
- * %G_OPTION_ARG_CALLBACK, %G_OPTION_ARG_STRING_ARRAY
- * or %G_OPTION_ARG_FILENAME_ARRAY.
- * 
- * 
- * Using #G_OPTION_REMAINING instead of simply scanning <literal>argv</literal>
- * for leftover arguments has the advantage that GOption takes care of 
- * necessary encoding conversions for strings or filenames.
- * 
- * Since: 2.6
- */
-#define G_OPTION_REMAINING ""
-
-GLIB_AVAILABLE_IN_ALL
-GOptionContext *g_option_context_new              (const gchar         *parameter_string);
-GLIB_AVAILABLE_IN_ALL
-void            g_option_context_set_summary      (GOptionContext      *context,
-                                                   const gchar         *summary);
-GLIB_AVAILABLE_IN_ALL
-const gchar *   g_option_context_get_summary      (GOptionContext     *context);
-GLIB_AVAILABLE_IN_ALL
-void            g_option_context_set_description  (GOptionContext      *context,
-                                                   const gchar         *description);
-GLIB_AVAILABLE_IN_ALL
-const gchar *   g_option_context_get_description  (GOptionContext     *context);
-GLIB_AVAILABLE_IN_ALL
-void            g_option_context_free             (GOptionContext      *context);
-GLIB_AVAILABLE_IN_ALL
-void		g_option_context_set_help_enabled (GOptionContext      *context,
-						   gboolean		help_enabled);
-GLIB_AVAILABLE_IN_ALL
-gboolean	g_option_context_get_help_enabled (GOptionContext      *context);
-GLIB_AVAILABLE_IN_ALL
-void		g_option_context_set_ignore_unknown_options (GOptionContext *context,
-							     gboolean	     ignore_unknown);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
-
-GLIB_AVAILABLE_IN_ALL
-void            g_option_context_add_main_entries (GOptionContext      *context,
-						   const GOptionEntry  *entries,
-						   const gchar         *translation_domain);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_option_context_parse            (GOptionContext      *context,
-						   gint                *argc,
-						   gchar             ***argv,
-						   GError             **error);
-GLIB_AVAILABLE_IN_ALL
-void            g_option_context_set_translate_func (GOptionContext     *context,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-GLIB_AVAILABLE_IN_ALL
-void            g_option_context_set_translation_domain (GOptionContext  *context,
-							 const gchar     *domain);
-
-GLIB_AVAILABLE_IN_ALL
-void            g_option_context_add_group      (GOptionContext *context,
-						 GOptionGroup   *group);
-GLIB_AVAILABLE_IN_ALL
-void          g_option_context_set_main_group (GOptionContext *context,
-					       GOptionGroup   *group);
-GLIB_AVAILABLE_IN_ALL
-GOptionGroup *g_option_context_get_main_group (GOptionContext *context);
-GLIB_AVAILABLE_IN_ALL
-gchar        *g_option_context_get_help       (GOptionContext *context,
-                                               gboolean        main_help,
-                                               GOptionGroup   *group);
-
-GLIB_AVAILABLE_IN_ALL
-GOptionGroup *g_option_group_new                    (const gchar        *name,
-						     const gchar        *description,
-						     const gchar        *help_description,
-						     gpointer            user_data,
-						     GDestroyNotify      destroy);
-GLIB_AVAILABLE_IN_ALL
-void	      g_option_group_set_parse_hooks	    (GOptionGroup       *group,
-						     GOptionParseFunc    pre_parse_func,
-						     GOptionParseFunc	 post_parse_func);
-GLIB_AVAILABLE_IN_ALL
-void	      g_option_group_set_error_hook	    (GOptionGroup       *group,
-						     GOptionErrorFunc	 error_func);
-GLIB_AVAILABLE_IN_ALL
-void          g_option_group_free                   (GOptionGroup       *group);
-GLIB_AVAILABLE_IN_ALL
-void          g_option_group_add_entries            (GOptionGroup       *group,
-						     const GOptionEntry *entries);
-GLIB_AVAILABLE_IN_ALL
-void          g_option_group_set_translate_func     (GOptionGroup       *group,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-GLIB_AVAILABLE_IN_ALL
-void          g_option_group_set_translation_domain (GOptionGroup       *group,
-						     const gchar        *domain);
-
-G_END_DECLS
-
-#endif /* __G_OPTION_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gpattern.h b/linux-x86/include/glib-2.0/glib/gpattern.h
deleted file mode 100644
index 956b003..0000000
--- a/linux-x86/include/glib-2.0/glib/gpattern.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 1999  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_PATTERN_H__
-#define __G_PATTERN_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-
-typedef struct _GPatternSpec    GPatternSpec;
-
-GLIB_AVAILABLE_IN_ALL
-GPatternSpec* g_pattern_spec_new       (const gchar  *pattern);
-GLIB_AVAILABLE_IN_ALL
-void          g_pattern_spec_free      (GPatternSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_pattern_spec_equal     (GPatternSpec *pspec1,
-					GPatternSpec *pspec2);
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_pattern_match          (GPatternSpec *pspec,
-					guint         string_length,
-					const gchar  *string,
-					const gchar  *string_reversed);
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_pattern_match_string   (GPatternSpec *pspec,
-					const gchar  *string);
-GLIB_AVAILABLE_IN_ALL
-gboolean      g_pattern_match_simple   (const gchar  *pattern,
-					const gchar  *string);
-
-G_END_DECLS
-
-#endif /* __G_PATTERN_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gpoll.h b/linux-x86/include/glib-2.0/glib/gpoll.h
deleted file mode 100644
index 3ba8420..0000000
--- a/linux-x86/include/glib-2.0/glib/gpoll.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* gpoll.h - poll(2) support
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_POLL_H__
-#define __G_POLL_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (__G_MAIN_H__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Any definitions using GPollFD or GPollFunc are primarily
- * for Unix and not guaranteed to be the compatible on all
- * operating systems on which GLib runs. Right now, the
- * GLib does use these functions on Win32 as well, but interprets
- * them in a fairly different way than on Unix. If you use
- * these definitions, you are should be prepared to recode
- * for different operating systems.
- *
- * Note that on systems with a working poll(2), that function is used
- * in place of g_poll(). Thus g_poll() must have the same signature as
- * poll(), meaning GPollFD must have the same layout as struct pollfd.
- *
- *
- * On Win32, the fd in a GPollFD should be Win32 HANDLE (*not* a file
- * descriptor as provided by the C runtime) that can be used by
- * MsgWaitForMultipleObjects. This does *not* include file handles
- * from CreateFile, SOCKETs, nor pipe handles. (But you can use
- * WSAEventSelect to signal events when a SOCKET is readable).
- *
- * On Win32, fd can also be the special value G_WIN32_MSG_HANDLE to
- * indicate polling for messages.
- *
- * But note that G_WIN32_MSG_HANDLE GPollFDs should not be used by GDK
- * (GTK) programs, as GDK itself wants to read messages and convert them
- * to GDK events.
- *
- * So, unless you really know what you are doing, it's best not to try
- * to use the main loop polling stuff for your own needs on
- * Windows.
- */
-typedef struct _GPollFD GPollFD;
-
-/**
- * GPollFunc:
- * @ufds: an array of #GPollFD elements
- * @nfsd: the number of elements in @ufds
- * @timeout_: the maximum time to wait for an event of the file descriptors.
- *     A negative value indicates an infinite timeout.
- *
- * Specifies the type of function passed to g_main_context_set_poll_func().
- * The semantics of the function should match those of the poll() system call.
- *
- * Returns: the number of #GPollFD elements which have events or errors
- *     reported, or -1 if an error occurred.
- */
-typedef gint    (*GPollFunc)    (GPollFD *ufds,
-                                 guint    nfsd,
-                                 gint     timeout_);
-
-/**
- * GPollFD:
- * @fd: the file descriptor to poll (or a <type>HANDLE</type> on Win32)
- * @events: a bitwise combination from #GIOCondition, specifying which
- *     events should be polled for. Typically for reading from a file
- *     descriptor you would use %G_IO_IN | %G_IO_HUP | %G_IO_ERR, and
- *     for writing you would use %G_IO_OUT | %G_IO_ERR.
- * @revents: a bitwise combination of flags from #GIOCondition, returned
- *     from the poll() function to indicate which events occurred.
- *
- * Represents a file descriptor, which events to poll for, and which events
- * occurred.
- */
-struct _GPollFD
-{
-#if defined (G_OS_WIN32) && GLIB_SIZEOF_VOID_P == 8
-  gint64	fd;
-#else
-  gint		fd;
-#endif
-  gushort 	events;
-  gushort 	revents;
-};
-
-#ifdef G_OS_WIN32
-#if GLIB_SIZEOF_VOID_P == 8
-#define G_POLLFD_FORMAT "%#I64x"
-#else
-#define G_POLLFD_FORMAT "%#x"
-#endif
-#else
-#define G_POLLFD_FORMAT "%d"
-#endif
-
-GLIB_AVAILABLE_IN_ALL
-gint g_poll (GPollFD *fds,
-	     guint    nfds,
-	     gint     timeout);
-
-G_END_DECLS
-
-#endif /* __G_POLL_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gprimes.h b/linux-x86/include/glib-2.0/glib/gprimes.h
deleted file mode 100644
index 536ace4..0000000
--- a/linux-x86/include/glib-2.0/glib/gprimes.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_PRIMES_H__
-#define __G_PRIMES_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Prime numbers.
- */
-
-/* This function returns prime numbers spaced by approximately 1.5-2.0
- * and is for use in resizing data structures which prefer
- * prime-valued sizes.	The closest spaced prime function returns the
- * next largest prime, or the highest it knows about which is about
- * MAXINT/4.
- */
-GLIB_AVAILABLE_IN_ALL
-guint	   g_spaced_primes_closest (guint num) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_PRIMES_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gprintf.h b/linux-x86/include/glib-2.0/glib/gprintf.h
deleted file mode 100644
index 0b01cc4..0000000
--- a/linux-x86/include/glib-2.0/glib/gprintf.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 2002  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_PRINTF_H__
-#define __G_PRINTF_H__
-
-#include <glib.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-gint                  g_printf    (gchar const *format,
-                                   ...) G_GNUC_PRINTF (1, 2);
-GLIB_AVAILABLE_IN_ALL
-gint                  g_fprintf   (FILE        *file,
-				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-GLIB_AVAILABLE_IN_ALL
-gint                  g_sprintf   (gchar       *string,
-				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-
-GLIB_AVAILABLE_IN_ALL
-gint                  g_vprintf   (gchar const *format,
-                                   va_list      args) G_GNUC_PRINTF(1, 0);
-GLIB_AVAILABLE_IN_ALL
-gint                  g_vfprintf  (FILE        *file,
-				   gchar const *format,
-				   va_list      args) G_GNUC_PRINTF(2, 0);
-GLIB_AVAILABLE_IN_ALL
-gint                  g_vsprintf  (gchar       *string,
-				   gchar const *format,
-				   va_list      args) G_GNUC_PRINTF(2, 0);
-GLIB_AVAILABLE_IN_ALL
-gint                  g_vasprintf (gchar      **string,
-				   gchar const *format,
-				   va_list      args) G_GNUC_PRINTF(2, 0);
-
-G_END_DECLS
-
-#endif /* __G_PRINTF_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gqsort.h b/linux-x86/include/glib-2.0/glib/gqsort.h
deleted file mode 100644
index c67d949..0000000
--- a/linux-x86/include/glib-2.0/glib/gqsort.h
+++ /dev/null
@@ -1,47 +0,0 @@
- /* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_QSORT_H__
-#define __G_QSORT_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-void g_qsort_with_data (gconstpointer    pbase,
-			gint             total_elems,
-			gsize            size,
-			GCompareDataFunc compare_func,
-			gpointer         user_data);
-
-G_END_DECLS
-
-#endif /* __G_QSORT_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gquark.h b/linux-x86/include/glib-2.0/glib/gquark.h
deleted file mode 100644
index 617dbd2..0000000
--- a/linux-x86/include/glib-2.0/glib/gquark.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_QUARK_H__
-#define __G_QUARK_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef guint32 GQuark;
-
-/* Quarks (string<->id association)
- */
-GLIB_AVAILABLE_IN_ALL
-GQuark                g_quark_try_string         (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
-GQuark                g_quark_from_static_string (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
-GQuark                g_quark_from_string        (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
-
-#define G_DEFINE_QUARK(QN, q_n)                                         \
-GQuark                                                                  \
-q_n##_quark (void)                                                      \
-{                                                                       \
-  static GQuark q;                                                      \
-                                                                        \
-  if G_UNLIKELY (q == 0)                                                \
-    q = g_quark_from_static_string (#QN);                               \
-                                                                        \
-  return q;                                                             \
-}
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_intern_string            (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_intern_static_string     (const gchar *string);
-
-G_END_DECLS
-
-#endif /* __G_QUARK_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gqueue.h b/linux-x86/include/glib-2.0/glib/gqueue.h
deleted file mode 100644
index 23536a4..0000000
--- a/linux-x86/include/glib-2.0/glib/gqueue.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_QUEUE_H__
-#define __G_QUEUE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GQueue GQueue;
-
-/**
- * GQueue:
- * @head: a pointer to the first element of the queue
- * @tail: a pointer to the last element of the queue
- * @length: the number of elements in the queue
- *
- * Contains the public fields of a
- * <link linkend="glib-Double-ended-Queues">Queue</link>.
- */
-struct _GQueue
-{
-  GList *head;
-  GList *tail;
-  guint  length;
-};
-
-/**
- * G_QUEUE_INIT:
- *
- * A statically-allocated #GQueue must be initialized with this
- * macro before it can be used. This macro can be used to initialize
- * a variable, but it cannot be assigned to a variable. In that case
- * you have to use g_queue_init().
- *
- * |[
- * GQueue my_queue = G_QUEUE_INIT;
- * ]|
- *
- * Since: 2.14
- */
-#define G_QUEUE_INIT { NULL, NULL, 0 }
-
-/* Queues
- */
-GLIB_AVAILABLE_IN_ALL
-GQueue*  g_queue_new            (void);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_free           (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_free_full      (GQueue           *queue,
-				GDestroyNotify    free_func);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_init           (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_clear          (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_queue_is_empty       (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-guint    g_queue_get_length     (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_reverse        (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-GQueue * g_queue_copy           (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_foreach        (GQueue           *queue,
-                                 GFunc             func,
-                                 gpointer          user_data);
-GLIB_AVAILABLE_IN_ALL
-GList *  g_queue_find           (GQueue           *queue,
-                                 gconstpointer     data);
-GLIB_AVAILABLE_IN_ALL
-GList *  g_queue_find_custom    (GQueue           *queue,
-                                 gconstpointer     data,
-                                 GCompareFunc      func);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_sort           (GQueue           *queue,
-                                 GCompareDataFunc  compare_func,
-                                 gpointer          user_data);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_push_head      (GQueue           *queue,
-                                 gpointer          data);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_push_tail      (GQueue           *queue,
-                                 gpointer          data);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_push_nth       (GQueue           *queue,
-                                 gpointer          data,
-                                 gint              n);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_queue_pop_head       (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_queue_pop_tail       (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_queue_pop_nth        (GQueue           *queue,
-                                 guint             n);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_queue_peek_head      (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_queue_peek_tail      (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_queue_peek_nth       (GQueue           *queue,
-                                 guint             n);
-GLIB_AVAILABLE_IN_ALL
-gint     g_queue_index          (GQueue           *queue,
-                                 gconstpointer     data);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_queue_remove         (GQueue           *queue,
-                                 gconstpointer     data);
-GLIB_AVAILABLE_IN_ALL
-guint    g_queue_remove_all     (GQueue           *queue,
-                                 gconstpointer     data);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_insert_before  (GQueue           *queue,
-                                 GList            *sibling,
-                                 gpointer          data);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_insert_after   (GQueue           *queue,
-                                 GList            *sibling,
-                                 gpointer          data);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_insert_sorted  (GQueue           *queue,
-                                 gpointer          data,
-                                 GCompareDataFunc  func,
-                                 gpointer          user_data);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_push_head_link (GQueue           *queue,
-                                 GList            *link_);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_push_tail_link (GQueue           *queue,
-                                 GList            *link_);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_push_nth_link  (GQueue           *queue,
-                                 gint              n,
-                                 GList            *link_);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_queue_pop_head_link  (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_queue_pop_tail_link  (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_queue_pop_nth_link   (GQueue           *queue,
-                                 guint             n);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_queue_peek_head_link (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_queue_peek_tail_link (GQueue           *queue);
-GLIB_AVAILABLE_IN_ALL
-GList*   g_queue_peek_nth_link  (GQueue           *queue,
-                                 guint             n);
-GLIB_AVAILABLE_IN_ALL
-gint     g_queue_link_index     (GQueue           *queue,
-                                 GList            *link_);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_unlink         (GQueue           *queue,
-                                 GList            *link_);
-GLIB_AVAILABLE_IN_ALL
-void     g_queue_delete_link    (GQueue           *queue,
-                                 GList            *link_);
-
-G_END_DECLS
-
-#endif /* __G_QUEUE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/grand.h b/linux-x86/include/glib-2.0/glib/grand.h
deleted file mode 100644
index b121e50..0000000
--- a/linux-x86/include/glib-2.0/glib/grand.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_RAND_H__
-#define __G_RAND_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GRand           GRand;
-
-/* GRand - a good and fast random number generator: Mersenne Twister
- * see http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html for more info.
- * The range functions return a value in the intervall [begin, end).
- * int          -> [0..2^32-1]
- * int_range    -> [begin..end-1]
- * double       -> [0..1)
- * double_range -> [begin..end)
- */
-
-GLIB_AVAILABLE_IN_ALL
-GRand*  g_rand_new_with_seed  (guint32  seed);
-GLIB_AVAILABLE_IN_ALL
-GRand*  g_rand_new_with_seed_array (const guint32 *seed,
-				    guint seed_length);
-GLIB_AVAILABLE_IN_ALL
-GRand*  g_rand_new            (void);
-GLIB_AVAILABLE_IN_ALL
-void    g_rand_free           (GRand   *rand_);
-GLIB_AVAILABLE_IN_ALL
-GRand*  g_rand_copy           (GRand   *rand_);
-GLIB_AVAILABLE_IN_ALL
-void    g_rand_set_seed       (GRand   *rand_,
-			       guint32  seed);
-GLIB_AVAILABLE_IN_ALL
-void	g_rand_set_seed_array (GRand   *rand_,
-			       const guint32 *seed,
-			       guint    seed_length);
-
-#define g_rand_boolean(rand_) ((g_rand_int (rand_) & (1 << 15)) != 0)
-
-GLIB_AVAILABLE_IN_ALL
-guint32 g_rand_int            (GRand   *rand_);
-GLIB_AVAILABLE_IN_ALL
-gint32  g_rand_int_range      (GRand   *rand_,
-			       gint32   begin,
-			       gint32   end);
-GLIB_AVAILABLE_IN_ALL
-gdouble g_rand_double         (GRand   *rand_);
-GLIB_AVAILABLE_IN_ALL
-gdouble g_rand_double_range   (GRand   *rand_,
-			       gdouble  begin,
-			       gdouble  end);
-GLIB_AVAILABLE_IN_ALL
-void    g_random_set_seed     (guint32  seed);
-
-#define g_random_boolean() ((g_random_int () & (1 << 15)) != 0)
-
-GLIB_AVAILABLE_IN_ALL
-guint32 g_random_int          (void);
-GLIB_AVAILABLE_IN_ALL
-gint32  g_random_int_range    (gint32   begin,
-			       gint32   end);
-GLIB_AVAILABLE_IN_ALL
-gdouble g_random_double       (void);
-GLIB_AVAILABLE_IN_ALL
-gdouble g_random_double_range (gdouble  begin,
-			       gdouble  end);
-
-
-G_END_DECLS
-
-#endif /* __G_RAND_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gregex.h b/linux-x86/include/glib-2.0/glib/gregex.h
deleted file mode 100644
index 77d9d04..0000000
--- a/linux-x86/include/glib-2.0/glib/gregex.h
+++ /dev/null
@@ -1,603 +0,0 @@
-/* GRegex -- regular expression API wrapper around PCRE.
- *
- * Copyright (C) 1999, 2000 Scott Wimer
- * Copyright (C) 2004, Matthias Clasen <mclasen@redhat.com>
- * Copyright (C) 2005 - 2007, Marco Barisione <marco@barisione.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __G_REGEX_H__
-#define __G_REGEX_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gerror.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-/**
- * GRegexError:
- * @G_REGEX_ERROR_COMPILE: Compilation of the regular expression failed.
- * @G_REGEX_ERROR_OPTIMIZE: Optimization of the regular expression failed.
- * @G_REGEX_ERROR_REPLACE: Replacement failed due to an ill-formed replacement
- *     string.
- * @G_REGEX_ERROR_MATCH: The match process failed.
- * @G_REGEX_ERROR_INTERNAL: Internal error of the regular expression engine.
- *     Since 2.16
- * @G_REGEX_ERROR_STRAY_BACKSLASH: "\\" at end of pattern. Since 2.16
- * @G_REGEX_ERROR_MISSING_CONTROL_CHAR: "\\c" at end of pattern. Since 2.16
- * @G_REGEX_ERROR_UNRECOGNIZED_ESCAPE: Unrecognized character follows "\\".
- *     Since 2.16
- * @G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER: Numbers out of order in "{}"
- *     quantifier. Since 2.16
- * @G_REGEX_ERROR_QUANTIFIER_TOO_BIG: Number too big in "{}" quantifier.
- *     Since 2.16
- * @G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS: Missing terminating "]" for
- *     character class. Since 2.16
- * @G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS: Invalid escape sequence
- *     in character class. Since 2.16
- * @G_REGEX_ERROR_RANGE_OUT_OF_ORDER: Range out of order in character class.
- *     Since 2.16
- * @G_REGEX_ERROR_NOTHING_TO_REPEAT: Nothing to repeat. Since 2.16
- * @G_REGEX_ERROR_UNRECOGNIZED_CHARACTER: Unrecognized character after "(?",
- *     "(?&lt;" or "(?P". Since 2.16
- * @G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS: POSIX named classes are
- *     supported only within a class. Since 2.16
- * @G_REGEX_ERROR_UNMATCHED_PARENTHESIS: Missing terminating ")" or ")"
- *     without opening "(". Since 2.16
- * @G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE: Reference to non-existent
- *     subpattern. Since 2.16
- * @G_REGEX_ERROR_UNTERMINATED_COMMENT: Missing terminating ")" after comment.
- *     Since 2.16
- * @G_REGEX_ERROR_EXPRESSION_TOO_LARGE: Regular expression too large.
- *     Since 2.16
- * @G_REGEX_ERROR_MEMORY_ERROR: Failed to get memory. Since 2.16
- * @G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND: Lookbehind assertion is not
- *     fixed length. Since 2.16
- * @G_REGEX_ERROR_MALFORMED_CONDITION: Malformed number or name after "(?(".
- *     Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES: Conditional group contains
- *     more than two branches. Since 2.16
- * @G_REGEX_ERROR_ASSERTION_EXPECTED: Assertion expected after "(?(".
- *     Since 2.16
- * @G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME: Unknown POSIX class name.
- *     Since 2.16
- * @G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED: POSIX collating
- *     elements are not supported. Since 2.16
- * @G_REGEX_ERROR_HEX_CODE_TOO_LARGE: Character value in "\\x{...}" sequence
- *     is too large. Since 2.16
- * @G_REGEX_ERROR_INVALID_CONDITION: Invalid condition "(?(0)". Since 2.16
- * @G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND: \\C not allowed in
- *     lookbehind assertion. Since 2.16
- * @G_REGEX_ERROR_INFINITE_LOOP: Recursive call could loop indefinitely.
- *     Since 2.16
- * @G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR: Missing terminator
- *     in subpattern name. Since 2.16
- * @G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME: Two named subpatterns have
- *     the same name. Since 2.16
- * @G_REGEX_ERROR_MALFORMED_PROPERTY: Malformed "\\P" or "\\p" sequence.
- *     Since 2.16
- * @G_REGEX_ERROR_UNKNOWN_PROPERTY: Unknown property name after "\\P" or
- *     "\\p". Since 2.16
- * @G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG: Subpattern name is too long
- *     (maximum 32 characters). Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_SUBPATTERNS: Too many named subpatterns (maximum
- *     10,000). Since 2.16
- * @G_REGEX_ERROR_INVALID_OCTAL_VALUE: Octal value is greater than "\\377".
- *     Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE: "DEFINE" group contains more
- *     than one branch. Since 2.16
- * @G_REGEX_ERROR_DEFINE_REPETION: Repeating a "DEFINE" group is not allowed.
- *     This error is never raised. Since: 2.16 Deprecated: 2.34
- * @G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS: Inconsistent newline options.
- *     Since 2.16
- * @G_REGEX_ERROR_MISSING_BACK_REFERENCE: "\\g" is not followed by a braced,
- *      angle-bracketed, or quoted name or number, or by a plain number. Since: 2.16
- * @G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE: relative reference must not be zero. Since: 2.34
- * @G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN: the backtracing
- *     control verb used does not allow an argument. Since: 2.34
- * @G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB: unknown backtracing 
- *     control verb. Since: 2.34
- * @G_REGEX_ERROR_NUMBER_TOO_BIG: number is too big in escape sequence. Since: 2.34
- * @G_REGEX_ERROR_MISSING_SUBPATTERN_NAME: Missing subpattern name. Since: 2.34
- * @G_REGEX_ERROR_MISSING_DIGIT: Missing digit. Since 2.34
- * @G_REGEX_ERROR_INVALID_DATA_CHARACTER: In JavaScript compatibility mode,
- *     "[" is an invalid data character. Since: 2.34
- * @G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME: different names for subpatterns of the 
- *     same number are not allowed. Since: 2.34
- * @G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED: the backtracing control
- *     verb requires an argument. Since: 2.34
- * @G_REGEX_ERROR_INVALID_CONTROL_CHAR: "\\c" must be followed by an ASCII 
- *     character. Since: 2.34
- * @G_REGEX_ERROR_MISSING_NAME: "\\k" is not followed by a braced, angle-bracketed, or 
- *     quoted name. Since: 2.34
- * @G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS: "\\N" is not supported in a class. Since: 2.34
- * @G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES: too many forward references. Since: 2.34
- * @G_REGEX_ERROR_NAME_TOO_LONG: the name is too long in "(*MARK)", "(*PRUNE)", 
- *     "(*SKIP)", or "(*THEN)". Since: 2.34
- * @G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE: the character value in the \\u sequence is
- *     too large. Since: 2.34
- *
- * Error codes returned by regular expressions functions.
- *
- * Since: 2.14
- */
-typedef enum
-{
-  G_REGEX_ERROR_COMPILE,
-  G_REGEX_ERROR_OPTIMIZE,
-  G_REGEX_ERROR_REPLACE,
-  G_REGEX_ERROR_MATCH,
-  G_REGEX_ERROR_INTERNAL,
-
-  /* These are the error codes from PCRE + 100 */
-  G_REGEX_ERROR_STRAY_BACKSLASH = 101,
-  G_REGEX_ERROR_MISSING_CONTROL_CHAR = 102,
-  G_REGEX_ERROR_UNRECOGNIZED_ESCAPE = 103,
-  G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER = 104,
-  G_REGEX_ERROR_QUANTIFIER_TOO_BIG = 105,
-  G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS = 106,
-  G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS = 107,
-  G_REGEX_ERROR_RANGE_OUT_OF_ORDER = 108,
-  G_REGEX_ERROR_NOTHING_TO_REPEAT = 109,
-  G_REGEX_ERROR_UNRECOGNIZED_CHARACTER = 112,
-  G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS = 113,
-  G_REGEX_ERROR_UNMATCHED_PARENTHESIS = 114,
-  G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE = 115,
-  G_REGEX_ERROR_UNTERMINATED_COMMENT = 118,
-  G_REGEX_ERROR_EXPRESSION_TOO_LARGE = 120,
-  G_REGEX_ERROR_MEMORY_ERROR = 121,
-  G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND = 125,
-  G_REGEX_ERROR_MALFORMED_CONDITION = 126,
-  G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES = 127,
-  G_REGEX_ERROR_ASSERTION_EXPECTED = 128,
-  G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME = 130,
-  G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED = 131,
-  G_REGEX_ERROR_HEX_CODE_TOO_LARGE = 134,
-  G_REGEX_ERROR_INVALID_CONDITION = 135,
-  G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND = 136,
-  G_REGEX_ERROR_INFINITE_LOOP = 140,
-  G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR = 142,
-  G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME = 143,
-  G_REGEX_ERROR_MALFORMED_PROPERTY = 146,
-  G_REGEX_ERROR_UNKNOWN_PROPERTY = 147,
-  G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG = 148,
-  G_REGEX_ERROR_TOO_MANY_SUBPATTERNS = 149,
-  G_REGEX_ERROR_INVALID_OCTAL_VALUE = 151,
-  G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE = 154,
-  G_REGEX_ERROR_DEFINE_REPETION = 155,
-  G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS = 156,
-  G_REGEX_ERROR_MISSING_BACK_REFERENCE = 157,
-  G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE = 158,
-  G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN = 159,
-  G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB  = 160,
-  G_REGEX_ERROR_NUMBER_TOO_BIG = 161,
-  G_REGEX_ERROR_MISSING_SUBPATTERN_NAME = 162,
-  G_REGEX_ERROR_MISSING_DIGIT = 163,
-  G_REGEX_ERROR_INVALID_DATA_CHARACTER = 164,
-  G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME = 165,
-  G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED = 166,
-  G_REGEX_ERROR_INVALID_CONTROL_CHAR = 168,
-  G_REGEX_ERROR_MISSING_NAME = 169,
-  G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS = 171,
-  G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES = 172,
-  G_REGEX_ERROR_NAME_TOO_LONG = 175,
-  G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE = 176
-} GRegexError;
-
-/**
- * G_REGEX_ERROR:
- *
- * Error domain for regular expressions. Errors in this domain will be
- * from the #GRegexError enumeration. See #GError for information on
- * error domains.
- *
- * Since: 2.14
- */
-#define G_REGEX_ERROR g_regex_error_quark ()
-
-GLIB_AVAILABLE_IN_ALL
-GQuark g_regex_error_quark (void);
-
-/**
- * GRegexCompileFlags:
- * @G_REGEX_CASELESS: Letters in the pattern match both upper- and
- *     lowercase letters. This option can be changed within a pattern
- *     by a "(?i)" option setting.
- * @G_REGEX_MULTILINE: By default, GRegex treats the strings as consisting
- *     of a single line of characters (even if it actually contains
- *     newlines). The "start of line" metacharacter ("^") matches only
- *     at the start of the string, while the "end of line" metacharacter
- *     ("$") matches only at the end of the string, or before a terminating
- *     newline (unless #G_REGEX_DOLLAR_ENDONLY is set). When
- *     #G_REGEX_MULTILINE is set, the "start of line" and "end of line"
- *     constructs match immediately following or immediately before any
- *     newline in the string, respectively, as well as at the very start
- *     and end. This can be changed within a pattern by a "(?m)" option
- *     setting.
- * @G_REGEX_DOTALL: A dot metacharater (".") in the pattern matches all
- *     characters, including newlines. Without it, newlines are excluded.
- *     This option can be changed within a pattern by a ("?s") option setting.
- * @G_REGEX_EXTENDED: Whitespace data characters in the pattern are
- *     totally ignored except when escaped or inside a character class.
- *     Whitespace does not include the VT character (code 11). In addition,
- *     characters between an unescaped "#" outside a character class and
- *     the next newline character, inclusive, are also ignored. This can
- *     be changed within a pattern by a "(?x)" option setting.
- * @G_REGEX_ANCHORED: The pattern is forced to be "anchored", that is,
- *     it is constrained to match only at the first matching point in the
- *     string that is being searched. This effect can also be achieved by
- *     appropriate constructs in the pattern itself such as the "^"
- *     metacharater.
- * @G_REGEX_DOLLAR_ENDONLY: A dollar metacharacter ("$") in the pattern
- *     matches only at the end of the string. Without this option, a
- *     dollar also matches immediately before the final character if
- *     it is a newline (but not before any other newlines). This option
- *     is ignored if #G_REGEX_MULTILINE is set.
- * @G_REGEX_UNGREEDY: Inverts the "greediness" of the quantifiers so that
- *     they are not greedy by default, but become greedy if followed by "?".
- *     It can also be set by a "(?U)" option setting within the pattern.
- * @G_REGEX_RAW: Usually strings must be valid UTF-8 strings, using this
- *     flag they are considered as a raw sequence of bytes.
- * @G_REGEX_NO_AUTO_CAPTURE: Disables the use of numbered capturing
- *     parentheses in the pattern. Any opening parenthesis that is not
- *     followed by "?" behaves as if it were followed by "?:" but named
- *     parentheses can still be used for capturing (and they acquire numbers
- *     in the usual way).
- * @G_REGEX_OPTIMIZE: Optimize the regular expression. If the pattern will
- *     be used many times, then it may be worth the effort to optimize it
- *     to improve the speed of matches.
- * @G_REGEX_FIRSTLINE: Limits an unanchored pattern to match before (or at) the
- *     first newline. Since: 2.34
- * @G_REGEX_DUPNAMES: Names used to identify capturing subpatterns need not
- *     be unique. This can be helpful for certain types of pattern when it
- *     is known that only one instance of the named subpattern can ever be
- *     matched.
- * @G_REGEX_NEWLINE_CR: Usually any newline character or character sequence is
- *     recognized. If this option is set, the only recognized newline character
- *     is '\r'.
- * @G_REGEX_NEWLINE_LF: Usually any newline character or character sequence is
- *     recognized. If this option is set, the only recognized newline character
- *     is '\n'.
- * @G_REGEX_NEWLINE_CRLF: Usually any newline character or character sequence is
- *     recognized. If this option is set, the only recognized newline character
- *     sequence is '\r\n'.
- * @G_REGEX_NEWLINE_ANYCRLF: Usually any newline character or character sequence
- *     is recognized. If this option is set, the only recognized newline character
- *     sequences are '\r', '\n', and '\r\n'. Since: 2.34
- * @G_REGEX_BSR_ANYCRLF: Usually any newline character or character sequence
- *     is recognised. If this option is set, then "\R" only recognizes the newline
- *    characters '\r', '\n' and '\r\n'. Since: 2.34
- * @G_REGEX_JAVASCRIPT_COMPAT: Changes behaviour so that it is compatible with
- *     JavaScript rather than PCRE. Since: 2.34
- *
- * Flags specifying compile-time options.
- *
- * Since: 2.14
- */
-/* Remember to update G_REGEX_COMPILE_MASK in gregex.c after
- * adding a new flag. */
-typedef enum
-{
-  G_REGEX_CASELESS          = 1 << 0,
-  G_REGEX_MULTILINE         = 1 << 1,
-  G_REGEX_DOTALL            = 1 << 2,
-  G_REGEX_EXTENDED          = 1 << 3,
-  G_REGEX_ANCHORED          = 1 << 4,
-  G_REGEX_DOLLAR_ENDONLY    = 1 << 5,
-  G_REGEX_UNGREEDY          = 1 << 9,
-  G_REGEX_RAW               = 1 << 11,
-  G_REGEX_NO_AUTO_CAPTURE   = 1 << 12,
-  G_REGEX_OPTIMIZE          = 1 << 13,
-  G_REGEX_FIRSTLINE         = 1 << 18,
-  G_REGEX_DUPNAMES          = 1 << 19,
-  G_REGEX_NEWLINE_CR        = 1 << 20,
-  G_REGEX_NEWLINE_LF        = 1 << 21,
-  G_REGEX_NEWLINE_CRLF      = G_REGEX_NEWLINE_CR | G_REGEX_NEWLINE_LF,
-  G_REGEX_NEWLINE_ANYCRLF   = G_REGEX_NEWLINE_CR | 1 << 22,
-  G_REGEX_BSR_ANYCRLF       = 1 << 23,
-  G_REGEX_JAVASCRIPT_COMPAT = 1 << 25
-} GRegexCompileFlags;
-
-/**
- * GRegexMatchFlags:
- * @G_REGEX_MATCH_ANCHORED: The pattern is forced to be "anchored", that is,
- *     it is constrained to match only at the first matching point in the
- *     string that is being searched. This effect can also be achieved by
- *     appropriate constructs in the pattern itself such as the "^"
- *     metacharater.
- * @G_REGEX_MATCH_NOTBOL: Specifies that first character of the string is
- *     not the beginning of a line, so the circumflex metacharacter should
- *     not match before it. Setting this without #G_REGEX_MULTILINE (at
- *     compile time) causes circumflex never to match. This option affects
- *     only the behaviour of the circumflex metacharacter, it does not
- *     affect "\A".
- * @G_REGEX_MATCH_NOTEOL: Specifies that the end of the subject string is
- *     not the end of a line, so the dollar metacharacter should not match
- *     it nor (except in multiline mode) a newline immediately before it.
- *     Setting this without #G_REGEX_MULTILINE (at compile time) causes
- *     dollar never to match. This option affects only the behaviour of
- *     the dollar metacharacter, it does not affect "\Z" or "\z".
- * @G_REGEX_MATCH_NOTEMPTY: An empty string is not considered to be a valid
- *     match if this option is set. If there are alternatives in the pattern,
- *     they are tried. If all the alternatives match the empty string, the
- *     entire match fails. For example, if the pattern "a?b?" is applied to
- *     a string not beginning with "a" or "b", it matches the empty string
- *     at the start of the string. With this flag set, this match is not
- *     valid, so GRegex searches further into the string for occurrences
- *     of "a" or "b".
- * @G_REGEX_MATCH_PARTIAL: Turns on the partial matching feature, for more
- *     documentation on partial matching see g_match_info_is_partial_match().
- * @G_REGEX_MATCH_NEWLINE_CR: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\r' character as line terminator.
- * @G_REGEX_MATCH_NEWLINE_LF: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\n' character as line terminator.
- * @G_REGEX_MATCH_NEWLINE_CRLF: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\r\n' characters sequence as line terminator.
- * @G_REGEX_MATCH_NEWLINE_ANY: Overrides the newline definition set when
- *     creating a new #GRegex, any Unicode newline sequence
- *     is recognised as a newline. These are '\r', '\n' and '\rn', and the
- *     single characters U+000B LINE TABULATION, U+000C FORM FEED (FF),
- *     U+0085 NEXT LINE (NEL), U+2028 LINE SEPARATOR and
- *     U+2029 PARAGRAPH SEPARATOR.
- * @G_REGEX_MATCH_NEWLINE_ANYCRLF: Overrides the newline definition set when
- *     creating a new #GRegex; any '\r', '\n', or '\r\n' character sequence
- *     is recognized as a newline. Since: 2.34
- * @G_REGEX_MATCH_BSR_ANYCRLF: Overrides the newline definition for "\R" set when
- *     creating a new #GRegex; only '\r', '\n', or '\r\n' character sequences
- *     are recognized as a newline by "\R". Since: 2.34
- * @G_REGEX_MATCH_BSR_ANY: Overrides the newline definition for "\R" set when
- *     creating a new #GRegex; any Unicode newline character or character sequence
- *     are recognized as a newline by "\R". These are '\r', '\n' and '\rn', and the
- *     single characters U+000B LINE TABULATION, U+000C FORM FEED (FF),
- *     U+0085 NEXT LINE (NEL), U+2028 LINE SEPARATOR and
- *     U+2029 PARAGRAPH SEPARATOR. Since: 2.34
- * @G_REGEX_MATCH_PARTIAL_SOFT: An alias for #G_REGEX_MATCH_PARTIAL. Since: 2.34
- * @G_REGEX_MATCH_PARTIAL_HARD: Turns on the partial matching feature. In contrast to
- *     to #G_REGEX_MATCH_PARTIAL_SOFT, this stops matching as soon as a partial match
- *     is found, without continuing to search for a possible complete match. See
- *     g_match_info_is_partial_match() for more information. Since: 2.34
- * @G_REGEX_MATCH_NOTEMPTY_ATSTART: Like #G_REGEX_MATCH_NOTEMPTY, but only applied to
- *     the start of the matched string. For anchored
- *     patterns this can only happen for pattern containing "\K". Since: 2.34
- *
- * Flags specifying match-time options.
- *
- * Since: 2.14
- */
-/* Remember to update G_REGEX_MATCH_MASK in gregex.c after
- * adding a new flag. */
-typedef enum
-{
-  G_REGEX_MATCH_ANCHORED         = 1 << 4,
-  G_REGEX_MATCH_NOTBOL           = 1 << 7,
-  G_REGEX_MATCH_NOTEOL           = 1 << 8,
-  G_REGEX_MATCH_NOTEMPTY         = 1 << 10,
-  G_REGEX_MATCH_PARTIAL          = 1 << 15,
-  G_REGEX_MATCH_NEWLINE_CR       = 1 << 20,
-  G_REGEX_MATCH_NEWLINE_LF       = 1 << 21,
-  G_REGEX_MATCH_NEWLINE_CRLF     = G_REGEX_MATCH_NEWLINE_CR | G_REGEX_MATCH_NEWLINE_LF,
-  G_REGEX_MATCH_NEWLINE_ANY      = 1 << 22,
-  G_REGEX_MATCH_NEWLINE_ANYCRLF  = G_REGEX_MATCH_NEWLINE_CR | G_REGEX_MATCH_NEWLINE_ANY,
-  G_REGEX_MATCH_BSR_ANYCRLF      = 1 << 23,
-  G_REGEX_MATCH_BSR_ANY          = 1 << 24,
-  G_REGEX_MATCH_PARTIAL_SOFT     = G_REGEX_MATCH_PARTIAL,
-  G_REGEX_MATCH_PARTIAL_HARD     = 1 << 27,
-  G_REGEX_MATCH_NOTEMPTY_ATSTART = 1 << 28
-} GRegexMatchFlags;
-
-/**
- * GRegex:
- *
- * A GRegex is the "compiled" form of a regular expression pattern. This
- * structure is opaque and its fields cannot be accessed directly.
- *
- * Since: 2.14
- */
-typedef struct _GRegex		GRegex;
-
-
-typedef struct _GMatchInfo	GMatchInfo;
-
-/**
- * GRegexEvalCallback:
- * @match_info: the #GMatchInfo generated by the match.
- *     Use g_match_info_get_regex() and g_match_info_get_string() if you
- *     need the #GRegex or the matched string.
- * @result: a #GString containing the new string
- * @user_data: user data passed to g_regex_replace_eval()
- *
- * Specifies the type of the function passed to g_regex_replace_eval().
- * It is called for each occurrence of the pattern in the string passed
- * to g_regex_replace_eval(), and it should append the replacement to
- * @result.
- *
- * Returns: %FALSE to continue the replacement process, %TRUE to stop it
- *
- * Since: 2.14
- */
-typedef gboolean (*GRegexEvalCallback)		(const GMatchInfo *match_info,
-						 GString          *result,
-						 gpointer          user_data);
-
-
-GLIB_AVAILABLE_IN_ALL
-GRegex		 *g_regex_new			(const gchar         *pattern,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-GLIB_AVAILABLE_IN_ALL
-GRegex           *g_regex_ref			(GRegex              *regex);
-GLIB_AVAILABLE_IN_ALL
-void		  g_regex_unref			(GRegex              *regex);
-GLIB_AVAILABLE_IN_ALL
-const gchar	 *g_regex_get_pattern		(const GRegex        *regex);
-GLIB_AVAILABLE_IN_ALL
-gint		  g_regex_get_max_backref	(const GRegex        *regex);
-GLIB_AVAILABLE_IN_ALL
-gint		  g_regex_get_capture_count	(const GRegex        *regex);
-GLIB_AVAILABLE_IN_ALL
-gboolean          g_regex_get_has_cr_or_lf      (const GRegex        *regex);
-GLIB_AVAILABLE_IN_2_38
-gint              g_regex_get_max_lookbehind    (const GRegex        *regex);
-GLIB_AVAILABLE_IN_ALL
-gint		  g_regex_get_string_number	(const GRegex        *regex, 
-						 const gchar         *name);
-GLIB_AVAILABLE_IN_ALL
-gchar		 *g_regex_escape_string		(const gchar         *string,
-						 gint                 length);
-GLIB_AVAILABLE_IN_ALL
-gchar		 *g_regex_escape_nul		(const gchar         *string,
-						 gint                 length);
-
-GLIB_AVAILABLE_IN_ALL
-GRegexCompileFlags g_regex_get_compile_flags    (const GRegex        *regex);
-GLIB_AVAILABLE_IN_ALL
-GRegexMatchFlags   g_regex_get_match_flags      (const GRegex        *regex);
-
-/* Matching. */
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_regex_match_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_regex_match			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_regex_match_full		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info,
-						 GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_regex_match_all		(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_regex_match_all_full	(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info,
-						 GError             **error);
-
-/* String splitting. */
-GLIB_AVAILABLE_IN_ALL
-gchar		**g_regex_split_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-GLIB_AVAILABLE_IN_ALL
-gchar		**g_regex_split			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options);
-GLIB_AVAILABLE_IN_ALL
-gchar		**g_regex_split_full		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 gint                 max_tokens,
-						 GError             **error);
-
-/* String replacement. */
-GLIB_AVAILABLE_IN_ALL
-gchar		 *g_regex_replace		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 const gchar         *replacement,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gchar		 *g_regex_replace_literal	(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 const gchar         *replacement,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gchar		 *g_regex_replace_eval		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GRegexEvalCallback   eval,
-						 gpointer             user_data,
-						 GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_regex_check_replacement	(const gchar         *replacement,
-						 gboolean            *has_references,
-						 GError             **error);
-
-/* Match info */
-GLIB_AVAILABLE_IN_ALL
-GRegex		 *g_match_info_get_regex	(const GMatchInfo    *match_info);
-GLIB_AVAILABLE_IN_ALL
-const gchar      *g_match_info_get_string       (const GMatchInfo    *match_info);
-
-GLIB_AVAILABLE_IN_ALL
-GMatchInfo       *g_match_info_ref              (GMatchInfo          *match_info);
-GLIB_AVAILABLE_IN_ALL
-void              g_match_info_unref            (GMatchInfo          *match_info);
-GLIB_AVAILABLE_IN_ALL
-void		  g_match_info_free		(GMatchInfo          *match_info);
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_match_info_next		(GMatchInfo          *match_info,
-						 GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_match_info_matches		(const GMatchInfo    *match_info);
-GLIB_AVAILABLE_IN_ALL
-gint		  g_match_info_get_match_count	(const GMatchInfo    *match_info);
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_match_info_is_partial_match	(const GMatchInfo    *match_info);
-GLIB_AVAILABLE_IN_ALL
-gchar		 *g_match_info_expand_references(const GMatchInfo    *match_info,
-						 const gchar         *string_to_expand,
-						 GError             **error);
-GLIB_AVAILABLE_IN_ALL
-gchar		 *g_match_info_fetch		(const GMatchInfo    *match_info,
-						 gint                 match_num);
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_match_info_fetch_pos	(const GMatchInfo    *match_info,
-						 gint                 match_num,
-						 gint                *start_pos,
-						 gint                *end_pos);
-GLIB_AVAILABLE_IN_ALL
-gchar		 *g_match_info_fetch_named	(const GMatchInfo    *match_info,
-						 const gchar         *name);
-GLIB_AVAILABLE_IN_ALL
-gboolean	  g_match_info_fetch_named_pos	(const GMatchInfo    *match_info,
-						 const gchar         *name,
-						 gint                *start_pos,
-						 gint                *end_pos);
-GLIB_AVAILABLE_IN_ALL
-gchar		**g_match_info_fetch_all	(const GMatchInfo    *match_info);
-
-G_END_DECLS
-
-#endif  /*  __G_REGEX_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gscanner.h b/linux-x86/include/glib-2.0/glib/gscanner.h
deleted file mode 100644
index 499d6e5..0000000
--- a/linux-x86/include/glib-2.0/glib/gscanner.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_SCANNER_H__
-#define __G_SCANNER_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gdataset.h>
-#include <glib/ghash.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GScanner	GScanner;
-typedef struct _GScannerConfig	GScannerConfig;
-typedef union  _GTokenValue     GTokenValue;
-
-typedef void		(*GScannerMsgFunc)	(GScanner      *scanner,
-						 gchar	       *message,
-						 gboolean	error);
-
-/* GScanner: Flexible lexical scanner for general purpose.
- */
-
-/* Character sets */
-#define G_CSET_A_2_Z	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-#define G_CSET_a_2_z	"abcdefghijklmnopqrstuvwxyz"
-#define G_CSET_DIGITS	"0123456789"
-#define G_CSET_LATINC	"\300\301\302\303\304\305\306"\
-			"\307\310\311\312\313\314\315\316\317\320"\
-			"\321\322\323\324\325\326"\
-			"\330\331\332\333\334\335\336"
-#define G_CSET_LATINS	"\337\340\341\342\343\344\345\346"\
-			"\347\350\351\352\353\354\355\356\357\360"\
-			"\361\362\363\364\365\366"\
-			"\370\371\372\373\374\375\376\377"
-
-/* Error types */
-typedef enum
-{
-  G_ERR_UNKNOWN,
-  G_ERR_UNEXP_EOF,
-  G_ERR_UNEXP_EOF_IN_STRING,
-  G_ERR_UNEXP_EOF_IN_COMMENT,
-  G_ERR_NON_DIGIT_IN_CONST,
-  G_ERR_DIGIT_RADIX,
-  G_ERR_FLOAT_RADIX,
-  G_ERR_FLOAT_MALFORMED
-} GErrorType;
-
-/* Token types */
-typedef enum
-{
-  G_TOKEN_EOF			=   0,
-  
-  G_TOKEN_LEFT_PAREN		= '(',
-  G_TOKEN_RIGHT_PAREN		= ')',
-  G_TOKEN_LEFT_CURLY		= '{',
-  G_TOKEN_RIGHT_CURLY		= '}',
-  G_TOKEN_LEFT_BRACE		= '[',
-  G_TOKEN_RIGHT_BRACE		= ']',
-  G_TOKEN_EQUAL_SIGN		= '=',
-  G_TOKEN_COMMA			= ',',
-  
-  G_TOKEN_NONE			= 256,
-  
-  G_TOKEN_ERROR,
-  
-  G_TOKEN_CHAR,
-  G_TOKEN_BINARY,
-  G_TOKEN_OCTAL,
-  G_TOKEN_INT,
-  G_TOKEN_HEX,
-  G_TOKEN_FLOAT,
-  G_TOKEN_STRING,
-  
-  G_TOKEN_SYMBOL,
-  G_TOKEN_IDENTIFIER,
-  G_TOKEN_IDENTIFIER_NULL,
-  
-  G_TOKEN_COMMENT_SINGLE,
-  G_TOKEN_COMMENT_MULTI,
-
-  /*< private >*/
-  G_TOKEN_LAST
-} GTokenType;
-
-union	_GTokenValue
-{
-  gpointer	v_symbol;
-  gchar		*v_identifier;
-  gulong	v_binary;
-  gulong	v_octal;
-  gulong	v_int;
-  guint64       v_int64;
-  gdouble	v_float;
-  gulong	v_hex;
-  gchar		*v_string;
-  gchar		*v_comment;
-  guchar	v_char;
-  guint		v_error;
-};
-
-struct	_GScannerConfig
-{
-  /* Character sets
-   */
-  gchar		*cset_skip_characters;		/* default: " \t\n" */
-  gchar		*cset_identifier_first;
-  gchar		*cset_identifier_nth;
-  gchar		*cpair_comment_single;		/* default: "#\n" */
-  
-  /* Should symbol lookup work case sensitive?
-   */
-  guint		case_sensitive : 1;
-  
-  /* Boolean values to be adjusted "on the fly"
-   * to configure scanning behaviour.
-   */
-  guint		skip_comment_multi : 1;		/* C like comment */
-  guint		skip_comment_single : 1;	/* single line comment */
-  guint		scan_comment_multi : 1;		/* scan multi line comments? */
-  guint		scan_identifier : 1;
-  guint		scan_identifier_1char : 1;
-  guint		scan_identifier_NULL : 1;
-  guint		scan_symbols : 1;
-  guint		scan_binary : 1;
-  guint		scan_octal : 1;
-  guint		scan_float : 1;
-  guint		scan_hex : 1;			/* '0x0ff0' */
-  guint		scan_hex_dollar : 1;		/* '$0ff0' */
-  guint		scan_string_sq : 1;		/* string: 'anything' */
-  guint		scan_string_dq : 1;		/* string: "\\-escapes!\n" */
-  guint		numbers_2_int : 1;		/* bin, octal, hex => int */
-  guint		int_2_float : 1;		/* int => G_TOKEN_FLOAT? */
-  guint		identifier_2_string : 1;
-  guint		char_2_token : 1;		/* return G_TOKEN_CHAR? */
-  guint		symbol_2_token : 1;
-  guint		scope_0_fallback : 1;		/* try scope 0 on lookups? */
-  guint		store_int64 : 1; 		/* use value.v_int64 rather than v_int */
-
-  /*< private >*/
-  guint		padding_dummy;
-};
-
-struct	_GScanner
-{
-  /* unused fields */
-  gpointer		user_data;
-  guint			max_parse_errors;
-  
-  /* g_scanner_error() increments this field */
-  guint			parse_errors;
-  
-  /* name of input stream, featured by the default message handler */
-  const gchar		*input_name;
-  
-  /* quarked data */
-  GData			*qdata;
-  
-  /* link into the scanner configuration */
-  GScannerConfig	*config;
-  
-  /* fields filled in after g_scanner_get_next_token() */
-  GTokenType		token;
-  GTokenValue		value;
-  guint			line;
-  guint			position;
-  
-  /* fields filled in after g_scanner_peek_next_token() */
-  GTokenType		next_token;
-  GTokenValue		next_value;
-  guint			next_line;
-  guint			next_position;
-
-  /*< private >*/
-  /* to be considered private */
-  GHashTable		*symbol_table;
-  gint			input_fd;
-  const gchar		*text;
-  const gchar		*text_end;
-  gchar			*buffer;
-  guint			scope_id;
-
-  /*< public >*/
-  /* handler function for _warn and _error */
-  GScannerMsgFunc	msg_handler;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GScanner*	g_scanner_new			(const GScannerConfig *config_templ);
-GLIB_AVAILABLE_IN_ALL
-void		g_scanner_destroy		(GScanner	*scanner);
-GLIB_AVAILABLE_IN_ALL
-void		g_scanner_input_file		(GScanner	*scanner,
-						 gint		input_fd);
-GLIB_AVAILABLE_IN_ALL
-void		g_scanner_sync_file_offset	(GScanner	*scanner);
-GLIB_AVAILABLE_IN_ALL
-void		g_scanner_input_text		(GScanner	*scanner,
-						 const	gchar	*text,
-						 guint		text_len);
-GLIB_AVAILABLE_IN_ALL
-GTokenType	g_scanner_get_next_token	(GScanner	*scanner);
-GLIB_AVAILABLE_IN_ALL
-GTokenType	g_scanner_peek_next_token	(GScanner	*scanner);
-GLIB_AVAILABLE_IN_ALL
-GTokenType	g_scanner_cur_token		(GScanner	*scanner);
-GLIB_AVAILABLE_IN_ALL
-GTokenValue	g_scanner_cur_value		(GScanner	*scanner);
-GLIB_AVAILABLE_IN_ALL
-guint		g_scanner_cur_line		(GScanner	*scanner);
-GLIB_AVAILABLE_IN_ALL
-guint		g_scanner_cur_position		(GScanner	*scanner);
-GLIB_AVAILABLE_IN_ALL
-gboolean	g_scanner_eof			(GScanner	*scanner);
-GLIB_AVAILABLE_IN_ALL
-guint		g_scanner_set_scope		(GScanner	*scanner,
-						 guint		 scope_id);
-GLIB_AVAILABLE_IN_ALL
-void		g_scanner_scope_add_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol,
-						 gpointer	value);
-GLIB_AVAILABLE_IN_ALL
-void		g_scanner_scope_remove_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-GLIB_AVAILABLE_IN_ALL
-gpointer	g_scanner_scope_lookup_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-GLIB_AVAILABLE_IN_ALL
-void		g_scanner_scope_foreach_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 GHFunc		 func,
-						 gpointer	 user_data);
-GLIB_AVAILABLE_IN_ALL
-gpointer	g_scanner_lookup_symbol		(GScanner	*scanner,
-						 const gchar	*symbol);
-GLIB_AVAILABLE_IN_ALL
-void		g_scanner_unexp_token		(GScanner	*scanner,
-						 GTokenType	expected_token,
-						 const gchar	*identifier_spec,
-						 const gchar	*symbol_spec,
-						 const gchar	*symbol_name,
-						 const gchar	*message,
-						 gint		 is_error);
-GLIB_AVAILABLE_IN_ALL
-void		g_scanner_error			(GScanner	*scanner,
-						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-GLIB_AVAILABLE_IN_ALL
-void		g_scanner_warn			(GScanner	*scanner,
-						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* keep downward source compatibility */
-#define		g_scanner_add_symbol( scanner, symbol, value )	G_STMT_START { \
-  g_scanner_scope_add_symbol ((scanner), 0, (symbol), (value)); \
-} G_STMT_END
-#define		g_scanner_remove_symbol( scanner, symbol )	G_STMT_START { \
-  g_scanner_scope_remove_symbol ((scanner), 0, (symbol)); \
-} G_STMT_END
-#define		g_scanner_foreach_symbol( scanner, func, data )	G_STMT_START { \
-  g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
-} G_STMT_END
-
-/* The following two functions are deprecated and will be removed in
- * the next major release. They do no good. */
-#define g_scanner_freeze_symbol_table(scanner) ((void)0)
-#define g_scanner_thaw_symbol_table(scanner) ((void)0)
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_SCANNER_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gsequence.h b/linux-x86/include/glib-2.0/glib/gsequence.h
deleted file mode 100644
index 81d06a2..0000000
--- a/linux-x86/include/glib-2.0/glib/gsequence.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
- * Soeren Sandmann (sandmann@daimi.au.dk)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SEQUENCE_H__
-#define __G_SEQUENCE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSequence      GSequence;
-typedef struct _GSequenceNode  GSequenceIter;
-
-typedef gint (* GSequenceIterCompareFunc) (GSequenceIter *a,
-                                           GSequenceIter *b,
-                                           gpointer       data);
-
-
-/* GSequence */
-GLIB_AVAILABLE_IN_ALL
-GSequence *    g_sequence_new                (GDestroyNotify            data_destroy);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_free               (GSequence                *seq);
-GLIB_AVAILABLE_IN_ALL
-gint           g_sequence_get_length         (GSequence                *seq);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_foreach            (GSequence                *seq,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_foreach_range      (GSequenceIter            *begin,
-                                              GSequenceIter            *end,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_sort               (GSequence                *seq,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_sort_iter          (GSequence                *seq,
-                                              GSequenceIterCompareFunc  cmp_func,
-                                              gpointer                  cmp_data);
-
-
-/* Getting iters */
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_get_begin_iter     (GSequence                *seq);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_get_end_iter       (GSequence                *seq);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_get_iter_at_pos    (GSequence                *seq,
-                                              gint                      pos);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_append             (GSequence                *seq,
-                                              gpointer                  data);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_prepend            (GSequence                *seq,
-                                              gpointer                  data);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_insert_before      (GSequenceIter            *iter,
-                                              gpointer                  data);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_move               (GSequenceIter            *src,
-                                              GSequenceIter            *dest);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_swap               (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_insert_sorted      (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_insert_sorted_iter (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_sort_changed       (GSequenceIter            *iter,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_sort_changed_iter  (GSequenceIter            *iter,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_remove             (GSequenceIter            *iter);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_remove_range       (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_move_range         (GSequenceIter            *dest,
-                                              GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_search             (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_search_iter        (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_lookup             (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_lookup_iter        (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-
-
-/* Dereferencing */
-GLIB_AVAILABLE_IN_ALL
-gpointer       g_sequence_get                (GSequenceIter            *iter);
-GLIB_AVAILABLE_IN_ALL
-void           g_sequence_set                (GSequenceIter            *iter,
-                                              gpointer                  data);
-
-/* Operations on GSequenceIter * */
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_sequence_iter_is_begin      (GSequenceIter            *iter);
-GLIB_AVAILABLE_IN_ALL
-gboolean       g_sequence_iter_is_end        (GSequenceIter            *iter);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_iter_next          (GSequenceIter            *iter);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_iter_prev          (GSequenceIter            *iter);
-GLIB_AVAILABLE_IN_ALL
-gint           g_sequence_iter_get_position  (GSequenceIter            *iter);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_iter_move          (GSequenceIter            *iter,
-                                              gint                      delta);
-GLIB_AVAILABLE_IN_ALL
-GSequence *    g_sequence_iter_get_sequence  (GSequenceIter            *iter);
-
-
-/* Search */
-GLIB_AVAILABLE_IN_ALL
-gint           g_sequence_iter_compare       (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GLIB_AVAILABLE_IN_ALL
-GSequenceIter *g_sequence_range_get_midpoint (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-
-G_END_DECLS
-
-#endif /* __G_SEQUENCE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gshell.h b/linux-x86/include/glib-2.0/glib/gshell.h
deleted file mode 100644
index cff6c5c..0000000
--- a/linux-x86/include/glib-2.0/glib/gshell.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* gshell.h - Shell-related utilities
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not, write
- * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SHELL_H__
-#define __G_SHELL_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_SHELL_ERROR g_shell_error_quark ()
-
-typedef enum
-{
-  /* mismatched or otherwise mangled quoting */
-  G_SHELL_ERROR_BAD_QUOTING,
-  /* string to be parsed was empty */
-  G_SHELL_ERROR_EMPTY_STRING,
-  G_SHELL_ERROR_FAILED
-} GShellError;
-
-GLIB_AVAILABLE_IN_ALL
-GQuark g_shell_error_quark (void);
-
-GLIB_AVAILABLE_IN_ALL
-gchar*   g_shell_quote      (const gchar   *unquoted_string);
-GLIB_AVAILABLE_IN_ALL
-gchar*   g_shell_unquote    (const gchar   *quoted_string,
-                             GError       **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_shell_parse_argv (const gchar   *command_line,
-                             gint          *argcp,
-                             gchar       ***argvp,
-                             GError       **error);
-
-G_END_DECLS
-
-#endif /* __G_SHELL_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gslice.h b/linux-x86/include/glib-2.0/glib/gslice.h
deleted file mode 100644
index e1b6686..0000000
--- a/linux-x86/include/glib-2.0/glib/gslice.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GLIB sliced memory - fast threaded memory chunk allocator
- * Copyright (C) 2005 Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SLICE_H__
-#define __G_SLICE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* slices - fast allocation/release of small memory blocks
- */
-GLIB_AVAILABLE_IN_ALL
-gpointer g_slice_alloc          	(gsize	       block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_slice_alloc0         	(gsize         block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_slice_copy                   (gsize         block_size,
-                                         gconstpointer mem_block) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-GLIB_AVAILABLE_IN_ALL
-void     g_slice_free1          	(gsize         block_size,
-					 gpointer      mem_block);
-GLIB_AVAILABLE_IN_ALL
-void     g_slice_free_chain_with_offset (gsize         block_size,
-					 gpointer      mem_chain,
-					 gsize         next_offset);
-#define  g_slice_new(type)      ((type*) g_slice_alloc (sizeof (type)))
-#define  g_slice_new0(type)     ((type*) g_slice_alloc0 (sizeof (type)))
-/* MemoryBlockType *
- *       g_slice_dup                    (MemoryBlockType,
- *	                                 MemoryBlockType *mem_block);
- *       g_slice_free                   (MemoryBlockType,
- *	                                 MemoryBlockType *mem_block);
- *       g_slice_free_chain             (MemoryBlockType,
- *                                       MemoryBlockType *first_chain_block,
- *                                       memory_block_next_field);
- * pseudo prototypes for the macro
- * definitions following below.
- */
-
-/* we go through extra hoops to ensure type safety */
-#define g_slice_dup(type, mem)                                  \
-  (1 ? (type*) g_slice_copy (sizeof (type), (mem))              \
-     : ((void) ((type*) 0 == (mem)), (type*) 0))
-#define g_slice_free(type, mem)				do {	\
-  if (1) g_slice_free1 (sizeof (type), (mem));			\
-  else   (void) ((type*) 0 == (mem)); 				\
-} while (0)
-#define g_slice_free_chain(type, mem_chain, next)	do {	\
-  if (1) g_slice_free_chain_with_offset (sizeof (type),		\
-                 (mem_chain), G_STRUCT_OFFSET (type, next)); 	\
-  else   (void) ((type*) 0 == (mem_chain));			\
-} while (0)
-
-
-/* --- internal debugging API --- */
-typedef enum {
-  G_SLICE_CONFIG_ALWAYS_MALLOC = 1,
-  G_SLICE_CONFIG_BYPASS_MAGAZINES,
-  G_SLICE_CONFIG_WORKING_SET_MSECS,
-  G_SLICE_CONFIG_COLOR_INCREMENT,
-  G_SLICE_CONFIG_CHUNK_SIZES,
-  G_SLICE_CONFIG_CONTENTION_COUNTER
-} GSliceConfig;
-
-GLIB_DEPRECATED_IN_2_34
-void     g_slice_set_config	   (GSliceConfig ckey, gint64 value);
-GLIB_DEPRECATED_IN_2_34
-gint64   g_slice_get_config	   (GSliceConfig ckey);
-GLIB_DEPRECATED_IN_2_34
-gint64*  g_slice_get_config_state  (GSliceConfig ckey, gint64 address, guint *n_values);
-
-#ifdef G_ENABLE_DEBUG
-GLIB_AVAILABLE_IN_ALL
-void     g_slice_debug_tree_statistics (void);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_SLICE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gslist.h b/linux-x86/include/glib-2.0/glib/gslist.h
deleted file mode 100644
index 55b91c6..0000000
--- a/linux-x86/include/glib-2.0/glib/gslist.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_SLIST_H__
-#define __G_SLIST_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gmem.h>
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSList GSList;
-
-struct _GSList
-{
-  gpointer data;
-  GSList *next;
-};
-
-/* Singly linked lists
- */
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-void     g_slist_free                    (GSList           *list);
-GLIB_AVAILABLE_IN_ALL
-void     g_slist_free_1                  (GSList           *list);
-#define	 g_slist_free1		         g_slist_free_1
-GLIB_AVAILABLE_IN_ALL
-void     g_slist_free_full               (GSList           *list,
-					  GDestroyNotify    free_func);
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_append                  (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_prepend                 (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_insert                  (GSList           *list,
-					  gpointer          data,
-					  gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_insert_sorted           (GSList           *list,
-					  gpointer          data,
-					  GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_insert_sorted_with_data (GSList           *list,
-					  gpointer          data,
-					  GCompareDataFunc  func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_insert_before           (GSList           *slist,
-					  GSList           *sibling,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_concat                  (GSList           *list1,
-					  GSList           *list2) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_remove                  (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_remove_all              (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_remove_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_delete_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_reverse                 (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_copy                    (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-
-GLIB_AVAILABLE_IN_2_34
-GSList*  g_slist_copy_deep               (GSList            *list,
-					  GCopyFunc         func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_nth                     (GSList           *list,
-					  guint             n);
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_find                    (GSList           *list,
-					  gconstpointer     data);
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_find_custom             (GSList           *list,
-					  gconstpointer     data,
-					  GCompareFunc      func);
-GLIB_AVAILABLE_IN_ALL
-gint     g_slist_position                (GSList           *list,
-					  GSList           *llink);
-GLIB_AVAILABLE_IN_ALL
-gint     g_slist_index                   (GSList           *list,
-					  gconstpointer     data);
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_last                    (GSList           *list);
-GLIB_AVAILABLE_IN_ALL
-guint    g_slist_length                  (GSList           *list);
-GLIB_AVAILABLE_IN_ALL
-void     g_slist_foreach                 (GSList           *list,
-					  GFunc             func,
-					  gpointer          user_data);
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_sort                    (GSList           *list,
-					  GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-GSList*  g_slist_sort_with_data          (GSList           *list,
-					  GCompareDataFunc  compare_func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GLIB_AVAILABLE_IN_ALL
-gpointer g_slist_nth_data                (GSList           *list,
-					  guint             n);
-
-#define  g_slist_next(slist)	         ((slist) ? (((GSList *)(slist))->next) : NULL)
-
-G_END_DECLS
-
-#endif /* __G_SLIST_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gspawn.h b/linux-x86/include/glib-2.0/glib/gspawn.h
deleted file mode 100644
index 5b5853a..0000000
--- a/linux-x86/include/glib-2.0/glib/gspawn.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/* gspawn.h - Process launching
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not, write
- * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SPAWN_H__
-#define __G_SPAWN_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-
-/* I'm not sure I remember our proposed naming convention here. */
-/**
- * G_SPAWN_ERROR:
- *
- * Error domain for spawning processes. Errors in this domain will
- * be from the #GSpawnError enumeration. See #GError for information on
- * error domains.
- */
-#define G_SPAWN_ERROR g_spawn_error_quark ()
-
-/**
- * GSpawnError:
- * @G_SPAWN_ERROR_FORK: Fork failed due to lack of memory.
- * @G_SPAWN_ERROR_READ: Read or select on pipes failed.
- * @G_SPAWN_ERROR_CHDIR: Changing to working directory failed.
- * @G_SPAWN_ERROR_ACCES: execv() returned <literal>EACCES</literal>
- * @G_SPAWN_ERROR_PERM: execv() returned <literal>EPERM</literal>
- * @G_SPAWN_ERROR_TOO_BIG: execv() returned <literal>E2BIG</literal>
- * @G_SPAWN_ERROR_2BIG: deprecated alias for %G_SPAWN_ERROR_TOO_BIG
- * @G_SPAWN_ERROR_NOEXEC: execv() returned <literal>ENOEXEC</literal>
- * @G_SPAWN_ERROR_NAMETOOLONG: execv() returned <literal>ENAMETOOLONG</literal>
- * @G_SPAWN_ERROR_NOENT: execv() returned <literal>ENOENT</literal>
- * @G_SPAWN_ERROR_NOMEM: execv() returned <literal>ENOMEM</literal>
- * @G_SPAWN_ERROR_NOTDIR: execv() returned <literal>ENOTDIR</literal>
- * @G_SPAWN_ERROR_LOOP: execv() returned <literal>ELOOP</literal>
- * @G_SPAWN_ERROR_TXTBUSY: execv() returned <literal>ETXTBUSY</literal>
- * @G_SPAWN_ERROR_IO: execv() returned <literal>EIO</literal>
- * @G_SPAWN_ERROR_NFILE: execv() returned <literal>ENFILE</literal>
- * @G_SPAWN_ERROR_MFILE: execv() returned <literal>EMFILE</literal>
- * @G_SPAWN_ERROR_INVAL: execv() returned <literal>EINVAL</literal>
- * @G_SPAWN_ERROR_ISDIR: execv() returned <literal>EISDIR</literal>
- * @G_SPAWN_ERROR_LIBBAD: execv() returned <literal>ELIBBAD</literal>
- * @G_SPAWN_ERROR_FAILED: Some other fatal failure,
- *   <literal>error-&gt;message</literal> should explain.
- *
- * Error codes returned by spawning processes.
- */
-typedef enum
-{
-  G_SPAWN_ERROR_FORK,   /* fork failed due to lack of memory */
-  G_SPAWN_ERROR_READ,   /* read or select on pipes failed */
-  G_SPAWN_ERROR_CHDIR,  /* changing to working dir failed */
-  G_SPAWN_ERROR_ACCES,  /* execv() returned EACCES */
-  G_SPAWN_ERROR_PERM,   /* execv() returned EPERM */
-  G_SPAWN_ERROR_TOO_BIG,/* execv() returned E2BIG */
-#ifndef G_DISABLE_DEPRECATED
-  G_SPAWN_ERROR_2BIG = G_SPAWN_ERROR_TOO_BIG,
-#endif
-  G_SPAWN_ERROR_NOEXEC, /* execv() returned ENOEXEC */
-  G_SPAWN_ERROR_NAMETOOLONG, /* ""  "" ENAMETOOLONG */
-  G_SPAWN_ERROR_NOENT,       /* ""  "" ENOENT */
-  G_SPAWN_ERROR_NOMEM,       /* ""  "" ENOMEM */
-  G_SPAWN_ERROR_NOTDIR,      /* ""  "" ENOTDIR */
-  G_SPAWN_ERROR_LOOP,        /* ""  "" ELOOP   */
-  G_SPAWN_ERROR_TXTBUSY,     /* ""  "" ETXTBUSY */
-  G_SPAWN_ERROR_IO,          /* ""  "" EIO */
-  G_SPAWN_ERROR_NFILE,       /* ""  "" ENFILE */
-  G_SPAWN_ERROR_MFILE,       /* ""  "" EMFLE */
-  G_SPAWN_ERROR_INVAL,       /* ""  "" EINVAL */
-  G_SPAWN_ERROR_ISDIR,       /* ""  "" EISDIR */
-  G_SPAWN_ERROR_LIBBAD,      /* ""  "" ELIBBAD */
-  G_SPAWN_ERROR_FAILED       /* other fatal failure, error->message
-                              * should explain
-                              */
-} GSpawnError;
-
-/**
- * G_SPAWN_EXIT_ERROR:
- *
- * Error domain used by g_spawn_check_exit_status().  The code
- * will be the program exit code.
- */
-#define G_SPAWN_EXIT_ERROR g_spawn_exit_error_quark ()
-
-/**
- * GSpawnChildSetupFunc:
- * @user_data: user data to pass to the function.
- *
- * Specifies the type of the setup function passed to g_spawn_async(),
- * g_spawn_sync() and g_spawn_async_with_pipes(), which can, in very
- * limited ways, be used to affect the child's execution.
- *
- * On POSIX platforms, the function is called in the child after GLib
- * has performed all the setup it plans to perform, but before calling
- * exec(). Actions taken in this function will only affect the child,
- * not the parent.
- *
- * On Windows, the function is called in the parent. Its usefulness on
- * Windows is thus questionable. In many cases executing the child setup
- * function in the parent can have ill effects, and you should be very
- * careful when porting software to Windows that uses child setup
- * functions.
- *
- * However, even on POSIX, you are extremely limited in what you can
- * safely do from a #GSpawnChildSetupFunc, because any mutexes that
- * were held by other threads in the parent process at the time of the
- * fork() will still be locked in the child process, and they will
- * never be unlocked (since the threads that held them don't exist in
- * the child). POSIX allows only async-signal-safe functions (see
- * <citerefentry><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>)
- * to be called in the child between fork() and exec(), which
- * drastically limits the usefulness of child setup functions.
- *
- * In particular, it is not safe to call any function which may
- * call malloc(), which includes POSIX functions such as setenv().
- * If you need to set up the child environment differently from
- * the parent, you should use g_get_environ(), g_environ_setenv(),
- * and g_environ_unsetenv(), and then pass the complete environment
- * list to the <literal>g_spawn...</literal> function.
- */
-typedef void (* GSpawnChildSetupFunc) (gpointer user_data);
-
-/**
- * GSpawnFlags:
- * @G_SPAWN_DEFAULT: no flags, default behaviour
- * @G_SPAWN_LEAVE_DESCRIPTORS_OPEN: the parent's open file descriptors will be
- *   inherited by the child; otherwise all descriptors except stdin/stdout/stderr
- *   will be closed before calling exec() in the child.
- * @G_SPAWN_DO_NOT_REAP_CHILD: the child will not be automatically reaped; you
- *   must use g_child_watch_add() yourself (or call waitpid()
- *   or handle <literal>SIGCHLD</literal> yourself), or the child will become a zombie.
- * @G_SPAWN_SEARCH_PATH: <literal>argv[0]</literal> need not be an absolute path,
- *   it will be looked for in the user's <envar>PATH</envar>.
- * @G_SPAWN_STDOUT_TO_DEV_NULL: the child's standard output will be discarded,
- *   instead of going to the same location as the parent's standard output.
- * @G_SPAWN_STDERR_TO_DEV_NULL: the child's standard error will be discarded.
- * @G_SPAWN_CHILD_INHERITS_STDIN: the child will inherit the parent's standard
- *   input (by default, the child's standard input is attached to
- *   <filename>/dev/null</filename>).
- * @G_SPAWN_FILE_AND_ARGV_ZERO: the first element of <literal>argv</literal> is
- *   the file to execute, while the remaining elements are the actual argument
- *   vector to pass to the file. Normally g_spawn_async_with_pipes() uses
- *   <literal>argv[0]</literal> as the file to execute, and passes all of
- *   <literal>argv</literal> to the child.
- * @G_SPAWN_SEARCH_PATH_FROM_ENVP: if <literal>argv[0]</literal> is not an abolute path,
- *   it will be looked for in the <envar>PATH</envar> from the passed child 
- *   environment. Since: 2.34
- *
- * Flags passed to g_spawn_sync(), g_spawn_async() and g_spawn_async_with_pipes().
- */
-typedef enum
-{
-  G_SPAWN_DEFAULT                = 0,
-  G_SPAWN_LEAVE_DESCRIPTORS_OPEN = 1 << 0,
-  G_SPAWN_DO_NOT_REAP_CHILD      = 1 << 1,
-  /* look for argv[0] in the path i.e. use execvp() */
-  G_SPAWN_SEARCH_PATH            = 1 << 2,
-  /* Dump output to /dev/null */
-  G_SPAWN_STDOUT_TO_DEV_NULL     = 1 << 3,
-  G_SPAWN_STDERR_TO_DEV_NULL     = 1 << 4,
-  G_SPAWN_CHILD_INHERITS_STDIN   = 1 << 5,
-  G_SPAWN_FILE_AND_ARGV_ZERO     = 1 << 6,
-  G_SPAWN_SEARCH_PATH_FROM_ENVP  = 1 << 7
-} GSpawnFlags;
-
-GLIB_AVAILABLE_IN_ALL
-GQuark g_spawn_error_quark (void);
-GLIB_AVAILABLE_IN_ALL
-GQuark g_spawn_exit_error_quark (void);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_spawn_async (const gchar           *working_directory,
-                        gchar                **argv,
-                        gchar                **envp,
-                        GSpawnFlags            flags,
-                        GSpawnChildSetupFunc   child_setup,
-                        gpointer               user_data,
-                        GPid                  *child_pid,
-                        GError               **error);
-
-
-/* Opens pipes for non-NULL standard_output, standard_input, standard_error,
- * and returns the parent's end of the pipes.
- */
-GLIB_AVAILABLE_IN_ALL
-gboolean g_spawn_async_with_pipes (const gchar          *working_directory,
-                                   gchar               **argv,
-                                   gchar               **envp,
-                                   GSpawnFlags           flags,
-                                   GSpawnChildSetupFunc  child_setup,
-                                   gpointer              user_data,
-                                   GPid                 *child_pid,
-                                   gint                 *standard_input,
-                                   gint                 *standard_output,
-                                   gint                 *standard_error,
-                                   GError              **error);
-
-
-/* If standard_output or standard_error are non-NULL, the full
- * standard output or error of the command will be placed there.
- */
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_spawn_sync         (const gchar          *working_directory,
-                               gchar               **argv,
-                               gchar               **envp,
-                               GSpawnFlags           flags,
-                               GSpawnChildSetupFunc  child_setup,
-                               gpointer              user_data,
-                               gchar               **standard_output,
-                               gchar               **standard_error,
-                               gint                 *exit_status,
-                               GError              **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_spawn_command_line_sync  (const gchar          *command_line,
-                                     gchar               **standard_output,
-                                     gchar               **standard_error,
-                                     gint                 *exit_status,
-                                     GError              **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_spawn_command_line_async (const gchar          *command_line,
-                                     GError              **error);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean g_spawn_check_exit_status (gint      exit_status,
-				    GError  **error);
-
-GLIB_AVAILABLE_IN_ALL
-void g_spawn_close_pid (GPid pid);
-
-#ifdef G_OS_WIN32
-#define g_spawn_async              g_spawn_async_utf8
-#define g_spawn_async_with_pipes   g_spawn_async_with_pipes_utf8
-#define g_spawn_sync               g_spawn_sync_utf8
-#define g_spawn_command_line_sync  g_spawn_command_line_sync_utf8
-#define g_spawn_command_line_async g_spawn_command_line_async_utf8
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_spawn_async_utf8              (const gchar           *working_directory,
-                                          gchar                **argv,
-                                          gchar                **envp,
-                                          GSpawnFlags            flags,
-                                          GSpawnChildSetupFunc   child_setup,
-                                          gpointer               user_data,
-                                          GPid                  *child_pid,
-                                          GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_spawn_async_with_pipes_utf8   (const gchar           *working_directory,
-                                          gchar                **argv,
-                                          gchar                **envp,
-                                          GSpawnFlags            flags,
-                                          GSpawnChildSetupFunc   child_setup,
-                                          gpointer               user_data,
-                                          GPid                  *child_pid,
-                                          gint                  *standard_input,
-                                          gint                  *standard_output,
-                                          gint                  *standard_error,
-                                          GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_spawn_sync_utf8               (const gchar           *working_directory,
-                                          gchar                **argv,
-                                          gchar                **envp,
-                                          GSpawnFlags            flags,
-                                          GSpawnChildSetupFunc   child_setup,
-                                          gpointer               user_data,
-                                          gchar                **standard_output,
-                                          gchar                **standard_error,
-                                          gint                  *exit_status,
-                                          GError               **error);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_spawn_command_line_sync_utf8  (const gchar           *command_line,
-                                          gchar                **standard_output,
-                                          gchar                **standard_error,
-                                          gint                  *exit_status,
-                                          GError               **error);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_spawn_command_line_async_utf8 (const gchar           *command_line,
-                                          GError               **error);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_SPAWN_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gstdio.h b/linux-x86/include/glib-2.0/glib/gstdio.h
deleted file mode 100644
index 90ee74e..0000000
--- a/linux-x86/include/glib-2.0/glib/gstdio.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* gstdio.h - GFilename wrappers for C library functions
- *
- * Copyright 2004 Tor Lillqvist
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_STDIO_H__
-#define __G_STDIO_H__
-
-#include <glib/gprintf.h>
-
-#include <sys/stat.h>
-
-G_BEGIN_DECLS
-
-#if defined (_MSC_VER) && !defined(_WIN64)
-
-/* Make it clear that we mean the struct with 32-bit st_size and
- * 32-bit st_*time fields as that is how the 32-bit GLib DLL normally
- * has been compiled. If you get a compiler warning when calling
- * g_stat(), do take it seriously and make sure that the type of
- * struct stat the code in GLib fills in matches the struct the type
- * of struct stat you pass to g_stat(). To avoid hassle, to get file
- * attributes just use the GIO API instead which doesn't use struct
- * stat.
- *
- * Sure, it would be nicer to use a struct with 64-bit st_size and
- * 64-bit st_*time fields, but changing that now would break ABI. And
- * in MinGW, a plain "struct stat" is the one with 32-bit st_size and
- * st_*time fields.
- */
-
-typedef struct _stat32 GStatBuf;
-
-#else
-
-typedef struct stat GStatBuf;
-
-#endif
-
-#if defined(G_OS_UNIX) && !defined(G_STDIO_NO_WRAP_ON_UNIX)
-
-/* Just pass on to the system functions, so there's no potential for data
- * format mismatches, especially with large file interfaces. 
- * A few functions can't be handled in this way, since they are not defined
- * in a portable system header that we could include here.
- */
-
-#ifndef __GTK_DOC_IGNORE__
-#define g_chmod   chmod
-#define g_open    open
-#define g_creat   creat
-#define g_rename  rename
-#define g_mkdir   mkdir
-#define g_stat    stat
-#define g_lstat   lstat
-#define g_remove  remove
-#define g_fopen   fopen
-#define g_freopen freopen
-#define g_utime   utime
-#endif
-
-GLIB_AVAILABLE_IN_ALL
-int g_access (const gchar *filename,
-	      int          mode);
-
-GLIB_AVAILABLE_IN_ALL
-int g_chdir  (const gchar *path);
-
-GLIB_AVAILABLE_IN_ALL
-int g_unlink (const gchar *filename);
-
-GLIB_AVAILABLE_IN_ALL
-int g_rmdir  (const gchar *filename);
-
-#else /* ! G_OS_UNIX */
-
-/* Wrappers for C library functions that take pathname arguments. On
- * Unix, the pathname is a file name as it literally is in the file
- * system. On well-maintained systems with consistent users who know
- * what they are doing and no exchange of files with others this would
- * be a well-defined encoding, preferably UTF-8. On Windows, the
- * pathname is always in UTF-8, even if that is not the on-disk
- * encoding, and not the encoding accepted by the C library or Win32
- * API.
- */
-
-GLIB_AVAILABLE_IN_ALL
-int g_access    (const gchar *filename,
-		 int          mode);
-
-GLIB_AVAILABLE_IN_ALL
-int g_chmod     (const gchar *filename,
-		 int          mode);
-
-GLIB_AVAILABLE_IN_ALL
-int g_open      (const gchar *filename,
-                 int          flags,
-                 int          mode);
-
-GLIB_AVAILABLE_IN_ALL
-int g_creat     (const gchar *filename,
-                 int          mode);
-
-GLIB_AVAILABLE_IN_ALL
-int g_rename    (const gchar *oldfilename,
-                 const gchar *newfilename);
-
-GLIB_AVAILABLE_IN_ALL
-int g_mkdir     (const gchar *filename,
-                 int          mode);
-
-GLIB_AVAILABLE_IN_ALL
-int g_chdir     (const gchar *path);
-
-GLIB_AVAILABLE_IN_ALL
-int g_stat      (const gchar *filename,
-                 GStatBuf    *buf);
-
-GLIB_AVAILABLE_IN_ALL
-int g_lstat     (const gchar *filename,
-                 GStatBuf    *buf);
-
-GLIB_AVAILABLE_IN_ALL
-int g_unlink    (const gchar *filename);
-
-GLIB_AVAILABLE_IN_ALL
-int g_remove    (const gchar *filename);
-
-GLIB_AVAILABLE_IN_ALL
-int g_rmdir     (const gchar *filename);
-
-GLIB_AVAILABLE_IN_ALL
-FILE *g_fopen   (const gchar *filename,
-                 const gchar *mode);
-
-GLIB_AVAILABLE_IN_ALL
-FILE *g_freopen (const gchar *filename,
-                 const gchar *mode,
-                 FILE        *stream);
-
-struct utimbuf;			/* Don't need the real definition of struct utimbuf when just
-				 * including this header.
-				 */
-
-GLIB_AVAILABLE_IN_ALL
-int g_utime     (const gchar    *filename,
-		 struct utimbuf *utb);
-
-#endif /* G_OS_UNIX */
-
-GLIB_AVAILABLE_IN_2_36
-gboolean g_close (gint       fd,
-                  GError   **error);
-
-G_END_DECLS
-
-#endif /* __G_STDIO_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gstrfuncs.h b/linux-x86/include/glib-2.0/glib/gstrfuncs.h
deleted file mode 100644
index 510623a..0000000
--- a/linux-x86/include/glib-2.0/glib/gstrfuncs.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_STRFUNCS_H__
-#define __G_STRFUNCS_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <stdarg.h>
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Functions like the ones in <ctype.h> that are not affected by locale. */
-typedef enum {
-  G_ASCII_ALNUM  = 1 << 0,
-  G_ASCII_ALPHA  = 1 << 1,
-  G_ASCII_CNTRL  = 1 << 2,
-  G_ASCII_DIGIT  = 1 << 3,
-  G_ASCII_GRAPH  = 1 << 4,
-  G_ASCII_LOWER  = 1 << 5,
-  G_ASCII_PRINT  = 1 << 6,
-  G_ASCII_PUNCT  = 1 << 7,
-  G_ASCII_SPACE  = 1 << 8,
-  G_ASCII_UPPER  = 1 << 9,
-  G_ASCII_XDIGIT = 1 << 10
-} GAsciiType;
-
-GLIB_VAR const guint16 * const g_ascii_table;
-
-#define g_ascii_isalnum(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_ALNUM) != 0)
-
-#define g_ascii_isalpha(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_ALPHA) != 0)
-
-#define g_ascii_iscntrl(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_CNTRL) != 0)
-
-#define g_ascii_isdigit(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_DIGIT) != 0)
-
-#define g_ascii_isgraph(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_GRAPH) != 0)
-
-#define g_ascii_islower(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_LOWER) != 0)
-
-#define g_ascii_isprint(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_PRINT) != 0)
-
-#define g_ascii_ispunct(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_PUNCT) != 0)
-
-#define g_ascii_isspace(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_SPACE) != 0)
-
-#define g_ascii_isupper(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_UPPER) != 0)
-
-#define g_ascii_isxdigit(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_XDIGIT) != 0)
-
-GLIB_AVAILABLE_IN_ALL
-gchar                 g_ascii_tolower  (gchar        c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gchar                 g_ascii_toupper  (gchar        c) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gint                  g_ascii_digit_value  (gchar    c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gint                  g_ascii_xdigit_value (gchar    c) G_GNUC_CONST;
-
-/* String utility functions that modify a string argument or
- * return a constant string that must not be freed.
- */
-#define	 G_STR_DELIMITERS	"_-|> <."
-GLIB_AVAILABLE_IN_ALL
-gchar*	              g_strdelimit     (gchar	     *string,
-					const gchar  *delimiters,
-					gchar	      new_delimiter);
-GLIB_AVAILABLE_IN_ALL
-gchar*	              g_strcanon       (gchar        *string,
-					const gchar  *valid_chars,
-					gchar         substitutor);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_strerror       (gint	      errnum) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_strsignal      (gint	      signum) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gchar *	              g_strreverse     (gchar	     *string);
-GLIB_AVAILABLE_IN_ALL
-gsize	              g_strlcpy	       (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-GLIB_AVAILABLE_IN_ALL
-gsize	              g_strlcat        (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-GLIB_AVAILABLE_IN_ALL
-gchar *               g_strstr_len     (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-GLIB_AVAILABLE_IN_ALL
-gchar *               g_strrstr        (const gchar  *haystack,
-					const gchar  *needle);
-GLIB_AVAILABLE_IN_ALL
-gchar *               g_strrstr_len    (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_str_has_suffix (const gchar  *str,
-					const gchar  *suffix);
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_str_has_prefix (const gchar  *str,
-					const gchar  *prefix);
-
-/* String to/from double conversion functions */
-
-GLIB_AVAILABLE_IN_ALL
-gdouble	              g_strtod         (const gchar  *nptr,
-					gchar	    **endptr);
-GLIB_AVAILABLE_IN_ALL
-gdouble	              g_ascii_strtod   (const gchar  *nptr,
-					gchar	    **endptr);
-GLIB_AVAILABLE_IN_ALL
-guint64		      g_ascii_strtoull (const gchar *nptr,
-					gchar      **endptr,
-					guint        base);
-GLIB_AVAILABLE_IN_ALL
-gint64		      g_ascii_strtoll  (const gchar *nptr,
-					gchar      **endptr,
-					guint        base);
-/* 29 bytes should enough for all possible values that
- * g_ascii_dtostr can produce.
- * Then add 10 for good measure */
-#define G_ASCII_DTOSTR_BUF_SIZE (29 + 10)
-GLIB_AVAILABLE_IN_ALL
-gchar *               g_ascii_dtostr   (gchar        *buffer,
-					gint          buf_len,
-					gdouble       d);
-GLIB_AVAILABLE_IN_ALL
-gchar *               g_ascii_formatd  (gchar        *buffer,
-					gint          buf_len,
-					const gchar  *format,
-					gdouble       d);
-
-/* removes leading spaces */
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_strchug        (gchar        *string);
-/* removes trailing spaces */
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_strchomp       (gchar        *string);
-/* removes leading & trailing spaces */
-#define g_strstrip( string )	g_strchomp (g_strchug (string))
-
-GLIB_AVAILABLE_IN_ALL
-gint                  g_ascii_strcasecmp  (const gchar *s1,
-					   const gchar *s2);
-GLIB_AVAILABLE_IN_ALL
-gint                  g_ascii_strncasecmp (const gchar *s1,
-					   const gchar *s2,
-					   gsize        n);
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_ascii_strdown     (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_ascii_strup       (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-
-
-GLIB_DEPRECATED
-gint                  g_strcasecmp     (const gchar *s1,
-                                        const gchar *s2);
-GLIB_DEPRECATED
-gint                  g_strncasecmp    (const gchar *s1,
-                                        const gchar *s2,
-                                        guint        n);
-GLIB_DEPRECATED
-gchar*                g_strdown        (gchar       *string);
-GLIB_DEPRECATED
-gchar*                g_strup          (gchar       *string);
-
-
-/* String utility functions that return a newly allocated string which
- * ought to be freed with g_free from the caller at some point.
- */
-GLIB_AVAILABLE_IN_ALL
-gchar*	              g_strdup	       (const gchar *str) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar*	              g_strdup_printf  (const gchar *format,
-					...) G_GNUC_PRINTF (1, 2) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar*	              g_strdup_vprintf (const gchar *format,
-					va_list      args) G_GNUC_PRINTF(1, 0)
-					G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar*	              g_strndup	       (const gchar *str,
-					gsize        n) G_GNUC_MALLOC;  
-GLIB_AVAILABLE_IN_ALL
-gchar*	              g_strnfill       (gsize        length,  
-					gchar        fill_char) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar*	              g_strconcat      (const gchar *string1,
-					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_strjoin	       (const gchar  *separator,
-					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-
-/* Make a copy of a string interpreting C string -style escape
- * sequences. Inverse of g_strescape. The recognized sequences are \b
- * \f \n \r \t \\ \" and the octal format.
- */
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_strcompress    (const gchar *source) G_GNUC_MALLOC;
-
-/* Copy a string escaping nonprintable characters like in C strings.
- * Inverse of g_strcompress. The exceptions parameter, if non-NULL, points
- * to a string containing characters that are not to be escaped.
- *
- * Deprecated API: gchar* g_strescape (const gchar *source);
- * Luckily this function wasn't used much, using NULL as second parameter
- * provides mostly identical semantics.
- */
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_strescape      (const gchar *source,
-					const gchar *exceptions) G_GNUC_MALLOC;
-
-GLIB_AVAILABLE_IN_ALL
-gpointer              g_memdup	       (gconstpointer mem,
-					guint	       byte_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(2);
-
-/* NULL terminated string arrays.
- * g_strsplit(), g_strsplit_set() split up string into max_tokens tokens
- * at delim and return a newly allocated string array.
- * g_strjoinv() concatenates all of str_array's strings, sliding in an
- * optional separator, the returned string is newly allocated.
- * g_strfreev() frees the array itself and all of its strings.
- * g_strdupv() copies a NULL-terminated array of strings
- * g_strv_length() returns the length of a NULL-terminated array of strings
- */
-GLIB_AVAILABLE_IN_ALL
-gchar**	              g_strsplit       (const gchar  *string,
-					const gchar  *delimiter,
-					gint          max_tokens) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar **	      g_strsplit_set   (const gchar *string,
-					const gchar *delimiters,
-					gint         max_tokens) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_strjoinv       (const gchar  *separator,
-					gchar       **str_array) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-void                  g_strfreev       (gchar       **str_array);
-GLIB_AVAILABLE_IN_ALL
-gchar**               g_strdupv        (gchar       **str_array) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-guint                 g_strv_length    (gchar       **str_array);
-
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_stpcpy         (gchar        *dest,
-                                        const char   *src);
-
-G_END_DECLS
-
-#endif /* __G_STRFUNCS_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gstring.h b/linux-x86/include/glib-2.0/glib/gstring.h
deleted file mode 100644
index 0cbba5d..0000000
--- a/linux-x86/include/glib-2.0/glib/gstring.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_STRING_H__
-#define __G_STRING_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gbytes.h>
-#include <glib/gutils.h>  /* for G_CAN_INLINE */
-
-G_BEGIN_DECLS
-
-typedef struct _GString         GString;
-
-struct _GString
-{
-  gchar  *str;
-  gsize len;
-  gsize allocated_len;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_new               (const gchar     *init);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_new_len           (const gchar     *init,
-                                         gssize           len);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_sized_new         (gsize            dfl_size);
-GLIB_AVAILABLE_IN_ALL
-gchar*       g_string_free              (GString         *string,
-                                         gboolean         free_segment);
-GLIB_AVAILABLE_IN_2_34
-GBytes*      g_string_free_to_bytes     (GString         *string);
-GLIB_AVAILABLE_IN_ALL
-gboolean     g_string_equal             (const GString   *v,
-                                         const GString   *v2);
-GLIB_AVAILABLE_IN_ALL
-guint        g_string_hash              (const GString   *str);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_assign            (GString         *string,
-                                         const gchar     *rval);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_truncate          (GString         *string,
-                                         gsize            len);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_set_size          (GString         *string,
-                                         gsize            len);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_insert_len        (GString         *string,
-                                         gssize           pos,
-                                         const gchar     *val,
-                                         gssize           len);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_append            (GString         *string,
-                                         const gchar     *val);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_append_len        (GString         *string,
-                                         const gchar     *val,
-                                         gssize           len);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_append_c          (GString         *string,
-                                         gchar            c);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_append_unichar    (GString         *string,
-                                         gunichar         wc);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_prepend           (GString         *string,
-                                         const gchar     *val);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_prepend_c         (GString         *string,
-                                         gchar            c);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_prepend_unichar   (GString         *string,
-                                         gunichar         wc);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_prepend_len       (GString         *string,
-                                         const gchar     *val,
-                                         gssize           len);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_insert            (GString         *string,
-                                         gssize           pos,
-                                         const gchar     *val);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_insert_c          (GString         *string,
-                                         gssize           pos,
-                                         gchar            c);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_insert_unichar    (GString         *string,
-                                         gssize           pos,
-                                         gunichar         wc);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_overwrite         (GString         *string,
-                                         gsize            pos,
-                                         const gchar     *val);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_overwrite_len     (GString         *string,
-                                         gsize            pos,
-                                         const gchar     *val,
-                                         gssize           len);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_erase             (GString         *string,
-                                         gssize           pos,
-                                         gssize           len);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_ascii_down        (GString         *string);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_ascii_up          (GString         *string);
-GLIB_AVAILABLE_IN_ALL
-void         g_string_vprintf           (GString         *string,
-                                         const gchar     *format,
-                                         va_list          args)
-                                         G_GNUC_PRINTF(2, 0);
-GLIB_AVAILABLE_IN_ALL
-void         g_string_printf            (GString         *string,
-                                         const gchar     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-GLIB_AVAILABLE_IN_ALL
-void         g_string_append_vprintf    (GString         *string,
-                                         const gchar     *format,
-                                         va_list          args)
-                                         G_GNUC_PRINTF(2, 0);
-GLIB_AVAILABLE_IN_ALL
-void         g_string_append_printf     (GString         *string,
-                                         const gchar     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-GLIB_AVAILABLE_IN_ALL
-GString*     g_string_append_uri_escaped (GString         *string,
-                                          const gchar     *unescaped,
-                                          const gchar     *reserved_chars_allowed,
-                                          gboolean         allow_utf8);
-
-/* -- optimize g_strig_append_c --- */
-#ifdef G_CAN_INLINE
-static inline GString*
-g_string_append_c_inline (GString *gstring,
-                          gchar    c)
-{
-  if (gstring->len + 1 < gstring->allocated_len)
-    {
-      gstring->str[gstring->len++] = c;
-      gstring->str[gstring->len] = 0;
-    }
-  else
-    g_string_insert_c (gstring, -1, c);
-  return gstring;
-}
-#define g_string_append_c(gstr,c)       g_string_append_c_inline (gstr, c)
-#endif /* G_CAN_INLINE */
-
-
-GLIB_DEPRECATED
-GString *g_string_down (GString *string);
-GLIB_DEPRECATED
-GString *g_string_up   (GString *string);
-
-#ifndef G_DISABLE_DEPRECATED
-#define  g_string_sprintf  g_string_printf
-#define  g_string_sprintfa g_string_append_printf
-#endif
-
-G_END_DECLS
-
-#endif /* __G_STRING_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gstringchunk.h b/linux-x86/include/glib-2.0/glib/gstringchunk.h
deleted file mode 100644
index 79848e1..0000000
--- a/linux-x86/include/glib-2.0/glib/gstringchunk.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_STRINGCHUNK_H__
-#define __G_STRINGCHUNK_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GStringChunk GStringChunk;
-
-GLIB_AVAILABLE_IN_ALL
-GStringChunk* g_string_chunk_new          (gsize size);
-GLIB_AVAILABLE_IN_ALL
-void          g_string_chunk_free         (GStringChunk *chunk);
-GLIB_AVAILABLE_IN_ALL
-void          g_string_chunk_clear        (GStringChunk *chunk);
-GLIB_AVAILABLE_IN_ALL
-gchar*        g_string_chunk_insert       (GStringChunk *chunk,
-                                           const gchar  *string);
-GLIB_AVAILABLE_IN_ALL
-gchar*        g_string_chunk_insert_len   (GStringChunk *chunk,
-                                           const gchar  *string,
-                                           gssize        len);
-GLIB_AVAILABLE_IN_ALL
-gchar*        g_string_chunk_insert_const (GStringChunk *chunk,
-                                           const gchar  *string);
-
-G_END_DECLS
-
-#endif /* __G_STRING_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gtestutils.h b/linux-x86/include/glib-2.0/glib/gtestutils.h
deleted file mode 100644
index 889df44..0000000
--- a/linux-x86/include/glib-2.0/glib/gtestutils.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/* GLib testing utilities
- * Copyright (C) 2007 Imendio AB
- * Authors: Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_TEST_UTILS_H__
-#define __G_TEST_UTILS_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gmessages.h>
-#include <glib/gstring.h>
-#include <glib/gerror.h>
-#include <glib/gslist.h>
-
-G_BEGIN_DECLS
-
-typedef struct GTestCase  GTestCase;
-typedef struct GTestSuite GTestSuite;
-typedef void (*GTestFunc)        (void);
-typedef void (*GTestDataFunc)    (gconstpointer user_data);
-typedef void (*GTestFixtureFunc) (gpointer      fixture,
-                                  gconstpointer user_data);
-
-/* assertion API */
-#define g_assert_cmpstr(s1, cmp, s2)    do { const char *__s1 = (s1), *__s2 = (s2); \
-                                             if (g_strcmp0 (__s1, __s2) cmp 0) ; else \
-                                               g_assertion_message_cmpstr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #s1 " " #cmp " " #s2, __s1, #cmp, __s2); } while (0)
-#define g_assert_cmpint(n1, cmp, n2)    do { gint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'i'); } while (0)
-#define g_assert_cmpuint(n1, cmp, n2)   do { guint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'i'); } while (0)
-#define g_assert_cmphex(n1, cmp, n2)    do { guint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'x'); } while (0)
-#define g_assert_cmpfloat(n1,cmp,n2)    do { long double __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'f'); } while (0)
-#define g_assert_no_error(err)          do { if (err) \
-                                               g_assertion_message_error (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #err, err, 0, 0); } while (0)
-#define g_assert_error(err, dom, c)	do { if (!err || (err)->domain != dom || (err)->code != c) \
-                                               g_assertion_message_error (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #err, err, dom, c); } while (0)
-#define g_assert_true(expr)             do { if G_LIKELY (expr) ; else \
-                                               g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                                    #expr); \
-                                           } while (0)
-#define g_assert_false(expr)            do { if G_LIKELY (!(expr)) ; else \
-                                               g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                                    #expr); \
-                                           } while (0)
-#define g_assert_null(expr)              do { if G_LIKELY ((expr) == NULL) ; else \
-                                               g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                                    #expr); \
-                                           } while (0)
-#ifdef G_DISABLE_ASSERT
-#define g_assert_not_reached()          do { (void) 0; } while (0)
-#define g_assert(expr)                  do { (void) 0; } while (0)
-#else /* !G_DISABLE_ASSERT */
-#define g_assert_not_reached()          do { g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, NULL); } while (0)
-#define g_assert(expr)                  do { if G_LIKELY (expr) ; else \
-                                               g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                                         #expr); \
-                                           } while (0)
-#endif /* !G_DISABLE_ASSERT */
-
-GLIB_AVAILABLE_IN_ALL
-int     g_strcmp0                       (const char     *str1,
-                                         const char     *str2);
-
-/* report performance results */
-GLIB_AVAILABLE_IN_ALL
-void    g_test_minimized_result         (double          minimized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-GLIB_AVAILABLE_IN_ALL
-void    g_test_maximized_result         (double          maximized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-
-/* initialize testing framework */
-GLIB_AVAILABLE_IN_ALL
-void    g_test_init                     (int            *argc,
-                                         char         ***argv,
-                                         ...);
-/* query testing framework config */
-#define g_test_initialized()            (g_test_config_vars->test_initialized)
-#define g_test_quick()                  (g_test_config_vars->test_quick)
-#define g_test_slow()                   (!g_test_config_vars->test_quick)
-#define g_test_thorough()               (!g_test_config_vars->test_quick)
-#define g_test_perf()                   (g_test_config_vars->test_perf)
-#define g_test_verbose()                (g_test_config_vars->test_verbose)
-#define g_test_quiet()                  (g_test_config_vars->test_quiet)
-#define g_test_undefined()              (g_test_config_vars->test_undefined)
-GLIB_AVAILABLE_IN_2_38
-gboolean g_test_subprocess (void);
-
-/* run all tests under toplevel suite (path: /) */
-GLIB_AVAILABLE_IN_ALL
-int     g_test_run                      (void);
-/* hook up a test functions under test path */
-GLIB_AVAILABLE_IN_ALL
-void    g_test_add_func                 (const char     *testpath,
-                                         GTestFunc       test_func);
-
-GLIB_AVAILABLE_IN_ALL
-void    g_test_add_data_func            (const char     *testpath,
-                                         gconstpointer   test_data,
-                                         GTestDataFunc   test_func);
-
-GLIB_AVAILABLE_IN_2_34
-void    g_test_add_data_func_full       (const char     *testpath,
-                                         gpointer        test_data,
-                                         GTestDataFunc   test_func,
-                                         GDestroyNotify  data_free_func);
-
-/* tell about failure */
-GLIB_AVAILABLE_IN_2_30
-void    g_test_fail                     (void);
-GLIB_AVAILABLE_IN_2_38
-void    g_test_incomplete               (const gchar *msg);
-GLIB_AVAILABLE_IN_2_38
-void    g_test_skip                     (const gchar *msg);
-GLIB_AVAILABLE_IN_2_38
-gboolean g_test_failed                  (void);
-GLIB_AVAILABLE_IN_2_38
-void    g_test_set_nonfatal_assertions  (void);
-
-/* hook up a test with fixture under test path */
-#define g_test_add(testpath, Fixture, tdata, fsetup, ftest, fteardown) \
-					G_STMT_START {			\
-                                         void (*add_vtable) (const char*,       \
-                                                    gsize,             \
-                                                    gconstpointer,     \
-                                                    void (*) (Fixture*, gconstpointer),   \
-                                                    void (*) (Fixture*, gconstpointer),   \
-                                                    void (*) (Fixture*, gconstpointer)) =  (void (*) (const gchar *, gsize, gconstpointer, void (*) (Fixture*, gconstpointer), void (*) (Fixture*, gconstpointer), void (*) (Fixture*, gconstpointer))) g_test_add_vtable; \
-                                         add_vtable \
-                                          (testpath, sizeof (Fixture), tdata, fsetup, ftest, fteardown); \
-					} G_STMT_END
-
-/* add test messages to the test report */
-GLIB_AVAILABLE_IN_ALL
-void    g_test_message                  (const char *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GLIB_AVAILABLE_IN_ALL
-void    g_test_bug_base                 (const char *uri_pattern);
-GLIB_AVAILABLE_IN_ALL
-void    g_test_bug                      (const char *bug_uri_snippet);
-/* measure test timings */
-GLIB_AVAILABLE_IN_ALL
-void    g_test_timer_start              (void);
-GLIB_AVAILABLE_IN_ALL
-double  g_test_timer_elapsed            (void); /* elapsed seconds */
-GLIB_AVAILABLE_IN_ALL
-double  g_test_timer_last               (void); /* repeat last elapsed() result */
-
-/* automatically g_free or g_object_unref upon teardown */
-GLIB_AVAILABLE_IN_ALL
-void    g_test_queue_free               (gpointer gfree_pointer);
-GLIB_AVAILABLE_IN_ALL
-void    g_test_queue_destroy            (GDestroyNotify destroy_func,
-                                         gpointer       destroy_data);
-#define g_test_queue_unref(gobject)     g_test_queue_destroy (g_object_unref, gobject)
-
-typedef enum {
-  G_TEST_TRAP_SILENCE_STDOUT    = 1 << 7,
-  G_TEST_TRAP_SILENCE_STDERR    = 1 << 8,
-  G_TEST_TRAP_INHERIT_STDIN     = 1 << 9
-} GTestTrapFlags;
-
-GLIB_DEPRECATED_IN_2_38_FOR (g_test_trap_subprocess)
-gboolean g_test_trap_fork               (guint64              usec_timeout,
-                                         GTestTrapFlags       test_trap_flags);
-
-typedef enum {
-  G_TEST_SUBPROCESS_INHERIT_STDIN  = 1 << 0,
-  G_TEST_SUBPROCESS_INHERIT_STDOUT = 1 << 1,
-  G_TEST_SUBPROCESS_INHERIT_STDERR = 1 << 2
-} GTestSubprocessFlags;
-
-GLIB_AVAILABLE_IN_2_38
-void     g_test_trap_subprocess         (const char           *test_path,
-                                         guint64               usec_timeout,
-                                         GTestSubprocessFlags  test_flags);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_test_trap_has_passed         (void);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_test_trap_reached_timeout    (void);
-#define  g_test_trap_assert_passed()                      g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 0, 0)
-#define  g_test_trap_assert_failed()                      g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 1, 0)
-#define  g_test_trap_assert_stdout(soutpattern)           g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 2, soutpattern)
-#define  g_test_trap_assert_stdout_unmatched(soutpattern) g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 3, soutpattern)
-#define  g_test_trap_assert_stderr(serrpattern)           g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 4, serrpattern)
-#define  g_test_trap_assert_stderr_unmatched(serrpattern) g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 5, serrpattern)
-
-/* provide seed-able random numbers for tests */
-#define  g_test_rand_bit()              (0 != (g_test_rand_int() & (1 << 15)))
-GLIB_AVAILABLE_IN_ALL
-gint32   g_test_rand_int                (void);
-GLIB_AVAILABLE_IN_ALL
-gint32   g_test_rand_int_range          (gint32          begin,
-                                         gint32          end);
-GLIB_AVAILABLE_IN_ALL
-double   g_test_rand_double             (void);
-GLIB_AVAILABLE_IN_ALL
-double   g_test_rand_double_range       (double          range_start,
-                                         double          range_end);
-
-/* semi-internal API */
-GLIB_AVAILABLE_IN_ALL
-GTestCase*    g_test_create_case        (const char       *test_name,
-                                         gsize             data_size,
-                                         gconstpointer     test_data,
-                                         GTestFixtureFunc  data_setup,
-                                         GTestFixtureFunc  data_test,
-                                         GTestFixtureFunc  data_teardown);
-GLIB_AVAILABLE_IN_ALL
-GTestSuite*   g_test_create_suite       (const char       *suite_name);
-GLIB_AVAILABLE_IN_ALL
-GTestSuite*   g_test_get_root           (void);
-GLIB_AVAILABLE_IN_ALL
-void          g_test_suite_add          (GTestSuite     *suite,
-                                         GTestCase      *test_case);
-GLIB_AVAILABLE_IN_ALL
-void          g_test_suite_add_suite    (GTestSuite     *suite,
-                                         GTestSuite     *nestedsuite);
-GLIB_AVAILABLE_IN_ALL
-int           g_test_run_suite          (GTestSuite     *suite);
-
-/* internal ABI */
-GLIB_AVAILABLE_IN_ALL
-void    g_test_trap_assertions          (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         guint64         assertion_flags, /* 0-pass, 1-fail, 2-outpattern, 4-errpattern */
-                                         const char     *pattern);
-GLIB_AVAILABLE_IN_ALL
-void    g_assertion_message             (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *message);
-GLIB_AVAILABLE_IN_ALL
-void    g_assertion_message_expr        (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr) G_GNUC_NORETURN;
-GLIB_AVAILABLE_IN_ALL
-void    g_assertion_message_cmpstr      (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         const char     *arg1,
-                                         const char     *cmp,
-                                         const char     *arg2);
-GLIB_AVAILABLE_IN_ALL
-void    g_assertion_message_cmpnum      (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         long double     arg1,
-                                         const char     *cmp,
-                                         long double     arg2,
-                                         char            numtype);
-GLIB_AVAILABLE_IN_ALL
-void    g_assertion_message_error       (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         const GError   *error,
-                                         GQuark          error_domain,
-                                         int             error_code);
-GLIB_AVAILABLE_IN_ALL
-void    g_test_add_vtable               (const char     *testpath,
-                                         gsize           data_size,
-                                         gconstpointer   test_data,
-                                         GTestFixtureFunc  data_setup,
-                                         GTestFixtureFunc  data_test,
-                                         GTestFixtureFunc  data_teardown);
-typedef struct {
-  gboolean      test_initialized;
-  gboolean      test_quick;     /* disable thorough tests */
-  gboolean      test_perf;      /* run performance tests */
-  gboolean      test_verbose;   /* extra info */
-  gboolean      test_quiet;     /* reduce output */
-  gboolean      test_undefined; /* run tests that are meant to assert */
-} GTestConfig;
-GLIB_VAR const GTestConfig * const g_test_config_vars;
-
-/* internal logging API */
-typedef enum {
-  G_TEST_LOG_NONE,
-  G_TEST_LOG_ERROR,             /* s:msg */
-  G_TEST_LOG_START_BINARY,      /* s:binaryname s:seed */
-  G_TEST_LOG_LIST_CASE,         /* s:testpath */
-  G_TEST_LOG_SKIP_CASE,         /* s:testpath */
-  G_TEST_LOG_START_CASE,        /* s:testpath */
-  G_TEST_LOG_STOP_CASE,         /* d:status d:nforks d:elapsed */
-  G_TEST_LOG_MIN_RESULT,        /* s:blurb d:result */
-  G_TEST_LOG_MAX_RESULT,        /* s:blurb d:result */
-  G_TEST_LOG_MESSAGE,           /* s:blurb */
-  G_TEST_LOG_START_SUITE,
-  G_TEST_LOG_STOP_SUITE
-} GTestLogType;
-
-typedef struct {
-  GTestLogType  log_type;
-  guint         n_strings;
-  gchar       **strings; /* NULL terminated */
-  guint         n_nums;
-  long double  *nums;
-} GTestLogMsg;
-typedef struct {
-  /*< private >*/
-  GString     *data;
-  GSList      *msgs;
-} GTestLogBuffer;
-
-GLIB_AVAILABLE_IN_ALL
-const char*     g_test_log_type_name    (GTestLogType    log_type);
-GLIB_AVAILABLE_IN_ALL
-GTestLogBuffer* g_test_log_buffer_new   (void);
-GLIB_AVAILABLE_IN_ALL
-void            g_test_log_buffer_free  (GTestLogBuffer *tbuffer);
-GLIB_AVAILABLE_IN_ALL
-void            g_test_log_buffer_push  (GTestLogBuffer *tbuffer,
-                                         guint           n_bytes,
-                                         const guint8   *bytes);
-GLIB_AVAILABLE_IN_ALL
-GTestLogMsg*    g_test_log_buffer_pop   (GTestLogBuffer *tbuffer);
-GLIB_AVAILABLE_IN_ALL
-void            g_test_log_msg_free     (GTestLogMsg    *tmsg);
-
-/**
- * GTestLogFatalFunc:
- * @log_domain: the log domain of the message
- * @log_level: the log level of the message (including the fatal and recursion flags)
- * @message: the message to process
- * @user_data: user data, set in g_test_log_set_fatal_handler()
- *
- * Specifies the prototype of fatal log handler functions.
- *
- * Return value: %TRUE if the program should abort, %FALSE otherwise
- *
- * Since: 2.22
- */
-typedef gboolean        (*GTestLogFatalFunc)    (const gchar    *log_domain,
-                                                 GLogLevelFlags  log_level,
-                                                 const gchar    *message,
-                                                 gpointer        user_data);
-GLIB_AVAILABLE_IN_ALL
-void
-g_test_log_set_fatal_handler            (GTestLogFatalFunc log_func,
-                                         gpointer          user_data);
-
-GLIB_AVAILABLE_IN_2_34
-void    g_test_expect_message                    (const gchar    *log_domain,
-                                                  GLogLevelFlags  log_level,
-                                                  const gchar    *pattern);
-GLIB_AVAILABLE_IN_2_34
-void    g_test_assert_expected_messages_internal (const char     *domain,
-                                                  const char     *file,
-                                                  int             line,
-                                                  const char     *func);
-
-typedef enum
-{
-  G_TEST_DIST,
-  G_TEST_BUILT
-} GTestFileType;
-
-GLIB_AVAILABLE_IN_2_38
-gchar * g_test_build_filename                    (GTestFileType   file_type,
-                                                  const gchar    *first_path,
-                                                  ...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_2_38
-const gchar *g_test_get_dir                      (GTestFileType   file_type);
-GLIB_AVAILABLE_IN_2_38
-const gchar *g_test_get_filename                 (GTestFileType   file_type,
-                                                  const gchar    *first_path,
-                                                  ...) G_GNUC_NULL_TERMINATED;
-
-#define g_test_assert_expected_messages() g_test_assert_expected_messages_internal (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC)
-
-G_END_DECLS
-
-#endif /* __G_TEST_UTILS_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gthread.h b/linux-x86/include/glib-2.0/glib/gthread.h
deleted file mode 100644
index 43c7891..0000000
--- a/linux-x86/include/glib-2.0/glib/gthread.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_THREAD_H__
-#define __G_THREAD_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gatomic.h>
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_THREAD_ERROR g_thread_error_quark ()
-GLIB_AVAILABLE_IN_ALL
-GQuark g_thread_error_quark (void);
-
-typedef enum
-{
-  G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */
-} GThreadError;
-
-typedef gpointer (*GThreadFunc) (gpointer data);
-
-typedef struct _GThread         GThread;
-
-typedef union  _GMutex          GMutex;
-typedef struct _GRecMutex       GRecMutex;
-typedef struct _GRWLock         GRWLock;
-typedef struct _GCond           GCond;
-typedef struct _GPrivate        GPrivate;
-typedef struct _GOnce           GOnce;
-
-union _GMutex
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-struct _GRWLock
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-struct _GCond
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-struct _GRecMutex
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-#define G_PRIVATE_INIT(notify) { NULL, (notify), { NULL, NULL } }
-struct _GPrivate
-{
-  /*< private >*/
-  gpointer       p;
-  GDestroyNotify notify;
-  gpointer future[2];
-};
-
-typedef enum
-{
-  G_ONCE_STATUS_NOTCALLED,
-  G_ONCE_STATUS_PROGRESS,
-  G_ONCE_STATUS_READY
-} GOnceStatus;
-
-#define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
-struct _GOnce
-{
-  volatile GOnceStatus status;
-  volatile gpointer retval;
-};
-
-#define G_LOCK_NAME(name)             g__ ## name ## _lock
-#define G_LOCK_DEFINE_STATIC(name)    static G_LOCK_DEFINE (name)
-#define G_LOCK_DEFINE(name)           GMutex G_LOCK_NAME (name)
-#define G_LOCK_EXTERN(name)           extern GMutex G_LOCK_NAME (name)
-
-#ifdef G_DEBUG_LOCKS
-#  define G_LOCK(name)                G_STMT_START{             \
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                   \
-             "file %s: line %d (%s): locking: %s ",             \
-             __FILE__,        __LINE__, G_STRFUNC,              \
-             #name);                                            \
-      g_mutex_lock (&G_LOCK_NAME (name));                       \
-   }G_STMT_END
-#  define G_UNLOCK(name)              G_STMT_START{             \
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                   \
-             "file %s: line %d (%s): unlocking: %s ",           \
-             __FILE__,        __LINE__, G_STRFUNC,              \
-             #name);                                            \
-     g_mutex_unlock (&G_LOCK_NAME (name));                      \
-   }G_STMT_END
-#  define G_TRYLOCK(name)                                       \
-      (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                  \
-             "file %s: line %d (%s): try locking: %s ",         \
-             __FILE__,        __LINE__, G_STRFUNC,              \
-             #name), g_mutex_trylock (&G_LOCK_NAME (name)))
-#else  /* !G_DEBUG_LOCKS */
-#  define G_LOCK(name) g_mutex_lock       (&G_LOCK_NAME (name))
-#  define G_UNLOCK(name) g_mutex_unlock   (&G_LOCK_NAME (name))
-#  define G_TRYLOCK(name) g_mutex_trylock (&G_LOCK_NAME (name))
-#endif /* !G_DEBUG_LOCKS */
-
-GLIB_AVAILABLE_IN_2_32
-GThread *       g_thread_ref                    (GThread        *thread);
-GLIB_AVAILABLE_IN_2_32
-void            g_thread_unref                  (GThread        *thread);
-GLIB_AVAILABLE_IN_2_32
-GThread *       g_thread_new                    (const gchar    *name,
-                                                 GThreadFunc     func,
-                                                 gpointer        data);
-GLIB_AVAILABLE_IN_2_32
-GThread *       g_thread_try_new                (const gchar    *name,
-                                                 GThreadFunc     func,
-                                                 gpointer        data,
-                                                 GError        **error);
-GLIB_AVAILABLE_IN_ALL
-GThread *       g_thread_self                   (void);
-GLIB_AVAILABLE_IN_ALL
-void            g_thread_exit                   (gpointer        retval);
-GLIB_AVAILABLE_IN_ALL
-gpointer        g_thread_join                   (GThread        *thread);
-GLIB_AVAILABLE_IN_ALL
-void            g_thread_yield                  (void);
-
-
-GLIB_AVAILABLE_IN_2_32
-void            g_mutex_init                    (GMutex         *mutex);
-GLIB_AVAILABLE_IN_2_32
-void            g_mutex_clear                   (GMutex         *mutex);
-GLIB_AVAILABLE_IN_ALL
-void            g_mutex_lock                    (GMutex         *mutex);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_mutex_trylock                 (GMutex         *mutex);
-GLIB_AVAILABLE_IN_ALL
-void            g_mutex_unlock                  (GMutex         *mutex);
-
-GLIB_AVAILABLE_IN_2_32
-void            g_rw_lock_init                  (GRWLock        *rw_lock);
-GLIB_AVAILABLE_IN_2_32
-void            g_rw_lock_clear                 (GRWLock        *rw_lock);
-GLIB_AVAILABLE_IN_2_32
-void            g_rw_lock_writer_lock           (GRWLock        *rw_lock);
-GLIB_AVAILABLE_IN_2_32
-gboolean        g_rw_lock_writer_trylock        (GRWLock        *rw_lock);
-GLIB_AVAILABLE_IN_2_32
-void            g_rw_lock_writer_unlock         (GRWLock        *rw_lock);
-GLIB_AVAILABLE_IN_2_32
-void            g_rw_lock_reader_lock           (GRWLock        *rw_lock);
-GLIB_AVAILABLE_IN_2_32
-gboolean        g_rw_lock_reader_trylock        (GRWLock        *rw_lock);
-GLIB_AVAILABLE_IN_2_32
-void            g_rw_lock_reader_unlock         (GRWLock        *rw_lock);
-
-GLIB_AVAILABLE_IN_2_32
-void            g_rec_mutex_init                (GRecMutex      *rec_mutex);
-GLIB_AVAILABLE_IN_2_32
-void            g_rec_mutex_clear               (GRecMutex      *rec_mutex);
-GLIB_AVAILABLE_IN_2_32
-void            g_rec_mutex_lock                (GRecMutex      *rec_mutex);
-GLIB_AVAILABLE_IN_2_32
-gboolean        g_rec_mutex_trylock             (GRecMutex      *rec_mutex);
-GLIB_AVAILABLE_IN_2_32
-void            g_rec_mutex_unlock              (GRecMutex      *rec_mutex);
-
-GLIB_AVAILABLE_IN_2_32
-void            g_cond_init                     (GCond          *cond);
-GLIB_AVAILABLE_IN_2_32
-void            g_cond_clear                    (GCond          *cond);
-GLIB_AVAILABLE_IN_ALL
-void            g_cond_wait                     (GCond          *cond,
-                                                 GMutex         *mutex);
-GLIB_AVAILABLE_IN_ALL
-void            g_cond_signal                   (GCond          *cond);
-GLIB_AVAILABLE_IN_ALL
-void            g_cond_broadcast                (GCond          *cond);
-GLIB_AVAILABLE_IN_2_32
-gboolean        g_cond_wait_until               (GCond          *cond,
-                                                 GMutex         *mutex,
-                                                 gint64          end_time);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer        g_private_get                   (GPrivate       *key);
-GLIB_AVAILABLE_IN_ALL
-void            g_private_set                   (GPrivate       *key,
-                                                 gpointer        value);
-GLIB_AVAILABLE_IN_2_32
-void            g_private_replace               (GPrivate       *key,
-                                                 gpointer        value);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer        g_once_impl                     (GOnce          *once,
-                                                 GThreadFunc     func,
-                                                 gpointer        arg);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_once_init_enter               (volatile void  *location);
-GLIB_AVAILABLE_IN_ALL
-void            g_once_init_leave               (volatile void  *location,
-                                                 gsize           result);
-
-#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
-# define g_once(once, func, arg) g_once_impl ((once), (func), (arg))
-#else /* !G_ATOMIC_OP_MEMORY_BARRIER_NEEDED*/
-# define g_once(once, func, arg) \
-  (((once)->status == G_ONCE_STATUS_READY) ? \
-   (once)->retval : \
-   g_once_impl ((once), (func), (arg)))
-#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
-#ifdef __GNUC__
-# define g_once_init_enter(location) \
-  (G_GNUC_EXTENSION ({                                               \
-    G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer));       \
-    (void) (0 ? (gpointer) *(location) : 0);                         \
-    (!g_atomic_pointer_get (location) &&                             \
-     g_once_init_enter (location));                                  \
-  }))
-# define g_once_init_leave(location, result) \
-  (G_GNUC_EXTENSION ({                                               \
-    G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer));       \
-    (void) (0 ? *(location) = (result) : 0);                         \
-    g_once_init_leave ((location), (gsize) (result));                \
-  }))
-#else
-# define g_once_init_enter(location) \
-  (g_once_init_enter((location)))
-# define g_once_init_leave(location, result) \
-  (g_once_init_leave((location), (gsize) (result)))
-#endif
-
-GLIB_AVAILABLE_IN_2_36
-guint          g_get_num_processors (void);
-
-G_END_DECLS
-
-#endif /* __G_THREAD_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gthreadpool.h b/linux-x86/include/glib-2.0/glib/gthreadpool.h
deleted file mode 100644
index c05d700..0000000
--- a/linux-x86/include/glib-2.0/glib/gthreadpool.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_THREADPOOL_H__
-#define __G_THREADPOOL_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GThreadPool GThreadPool;
-
-/* Thread Pools
- */
-
-struct _GThreadPool
-{
-  GFunc func;
-  gpointer user_data;
-  gboolean exclusive;
-};
-
-GLIB_AVAILABLE_IN_ALL
-GThreadPool *   g_thread_pool_new               (GFunc            func,
-                                                 gpointer         user_data,
-                                                 gint             max_threads,
-                                                 gboolean         exclusive,
-                                                 GError         **error);
-GLIB_AVAILABLE_IN_ALL
-void            g_thread_pool_free              (GThreadPool     *pool,
-                                                 gboolean         immediate,
-                                                 gboolean         wait_);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_thread_pool_push              (GThreadPool     *pool,
-                                                 gpointer         data,
-                                                 GError         **error);
-GLIB_AVAILABLE_IN_ALL
-guint           g_thread_pool_unprocessed       (GThreadPool     *pool);
-GLIB_AVAILABLE_IN_ALL
-void            g_thread_pool_set_sort_function (GThreadPool      *pool,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-GLIB_AVAILABLE_IN_ALL
-gboolean        g_thread_pool_set_max_threads   (GThreadPool     *pool,
-                                                 gint             max_threads,
-                                                 GError         **error);
-GLIB_AVAILABLE_IN_ALL
-gint            g_thread_pool_get_max_threads   (GThreadPool     *pool);
-GLIB_AVAILABLE_IN_ALL
-guint           g_thread_pool_get_num_threads   (GThreadPool     *pool);
-
-GLIB_AVAILABLE_IN_ALL
-void            g_thread_pool_set_max_unused_threads (gint  max_threads);
-GLIB_AVAILABLE_IN_ALL
-gint            g_thread_pool_get_max_unused_threads (void);
-GLIB_AVAILABLE_IN_ALL
-guint           g_thread_pool_get_num_unused_threads (void);
-GLIB_AVAILABLE_IN_ALL
-void            g_thread_pool_stop_unused_threads    (void);
-GLIB_AVAILABLE_IN_ALL
-void            g_thread_pool_set_max_idle_time      (guint interval);
-GLIB_AVAILABLE_IN_ALL
-guint           g_thread_pool_get_max_idle_time      (void);
-
-G_END_DECLS
-
-#endif /* __G_THREADPOOL_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gtimer.h b/linux-x86/include/glib-2.0/glib/gtimer.h
deleted file mode 100644
index 702e002..0000000
--- a/linux-x86/include/glib-2.0/glib/gtimer.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_TIMER_H__
-#define __G_TIMER_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Timer
- */
-
-/* microseconds per second */
-typedef struct _GTimer		GTimer;
-
-#define G_USEC_PER_SEC 1000000
-
-GLIB_AVAILABLE_IN_ALL
-GTimer*  g_timer_new	         (void);
-GLIB_AVAILABLE_IN_ALL
-void	 g_timer_destroy         (GTimer      *timer);
-GLIB_AVAILABLE_IN_ALL
-void	 g_timer_start	         (GTimer      *timer);
-GLIB_AVAILABLE_IN_ALL
-void	 g_timer_stop	         (GTimer      *timer);
-GLIB_AVAILABLE_IN_ALL
-void	 g_timer_reset	         (GTimer      *timer);
-GLIB_AVAILABLE_IN_ALL
-void	 g_timer_continue        (GTimer      *timer);
-GLIB_AVAILABLE_IN_ALL
-gdouble  g_timer_elapsed         (GTimer      *timer,
-				  gulong      *microseconds);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_usleep                (gulong       microseconds);
-
-GLIB_AVAILABLE_IN_ALL
-void     g_time_val_add          (GTimeVal    *time_, 
-                                  glong        microseconds);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_time_val_from_iso8601 (const gchar *iso_date,
-				  GTimeVal    *time_);
-GLIB_AVAILABLE_IN_ALL
-gchar*   g_time_val_to_iso8601   (GTimeVal    *time_) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_TIMER_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gtimezone.h b/linux-x86/include/glib-2.0/glib/gtimezone.h
deleted file mode 100644
index 536acb1..0000000
--- a/linux-x86/include/glib-2.0/glib/gtimezone.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_TIME_ZONE_H__
-#define __G_TIME_ZONE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTimeZone GTimeZone;
-
-/**
- * GTimeType:
- * @G_TIME_TYPE_STANDARD: the time is in local standard time
- * @G_TIME_TYPE_DAYLIGHT: the time is in local daylight time
- * @G_TIME_TYPE_UNIVERSAL: the time is in UTC
- *
- * Disambiguates a given time in two ways.
- *
- * First, specifies if the given time is in universal or local time.
- *
- * Second, if the time is in local time, specifies if it is local
- * standard time or local daylight time.  This is important for the case
- * where the same local time occurs twice (during daylight savings time
- * transitions, for example).
- */
-typedef enum
-{
-  G_TIME_TYPE_STANDARD,
-  G_TIME_TYPE_DAYLIGHT,
-  G_TIME_TYPE_UNIVERSAL
-} GTimeType;
-
-GLIB_AVAILABLE_IN_ALL
-GTimeZone *             g_time_zone_new                                 (const gchar *identifier);
-GLIB_AVAILABLE_IN_ALL
-GTimeZone *             g_time_zone_new_utc                             (void);
-GLIB_AVAILABLE_IN_ALL
-GTimeZone *             g_time_zone_new_local                           (void);
-
-GLIB_AVAILABLE_IN_ALL
-GTimeZone *             g_time_zone_ref                                 (GTimeZone   *tz);
-GLIB_AVAILABLE_IN_ALL
-void                    g_time_zone_unref                               (GTimeZone   *tz);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_time_zone_find_interval                       (GTimeZone   *tz,
-                                                                         GTimeType    type,
-                                                                         gint64       time_);
-
-GLIB_AVAILABLE_IN_ALL
-gint                    g_time_zone_adjust_time                         (GTimeZone   *tz,
-                                                                         GTimeType    type,
-                                                                         gint64      *time_);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *           g_time_zone_get_abbreviation                    (GTimeZone   *tz,
-                                                                         gint         interval);
-GLIB_AVAILABLE_IN_ALL
-gint32                  g_time_zone_get_offset                          (GTimeZone   *tz,
-                                                                         gint         interval);
-GLIB_AVAILABLE_IN_ALL
-gboolean                g_time_zone_is_dst                              (GTimeZone   *tz,
-                                                                         gint         interval);
-
-G_END_DECLS
-
-#endif /* __G_TIME_ZONE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gtrashstack.h b/linux-x86/include/glib-2.0/glib/gtrashstack.h
deleted file mode 100644
index bff504d..0000000
--- a/linux-x86/include/glib-2.0/glib/gtrashstack.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_TRASH_STACK_H__
-#define __G_TRASH_STACK_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gutils.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTrashStack GTrashStack;
-struct _GTrashStack
-{
-  GTrashStack *next;
-};
-
-G_INLINE_FUNC void      g_trash_stack_push   (GTrashStack **stack_p,
-                                              gpointer      data_p);
-G_INLINE_FUNC gpointer  g_trash_stack_pop    (GTrashStack **stack_p);
-G_INLINE_FUNC gpointer  g_trash_stack_peek   (GTrashStack **stack_p);
-G_INLINE_FUNC guint     g_trash_stack_height (GTrashStack **stack_p);
-
-#if defined (G_CAN_INLINE) || defined (__G_TRASH_STACK_C__)
-
-G_INLINE_FUNC void
-g_trash_stack_push (GTrashStack **stack_p,
-                    gpointer      data_p)
-{
-  GTrashStack *data = (GTrashStack *) data_p;
-
-  data->next = *stack_p;
-  *stack_p = data;
-}
-G_INLINE_FUNC gpointer
-g_trash_stack_pop (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-
-  data = *stack_p;
-  if (data)
-    {
-      *stack_p = data->next;
-      /* NULLify private pointer here, most platforms store NULL as
-       * subsequent 0 bytes
-       */
-      data->next = NULL;
-    }
-
-  return data;
-}
-G_INLINE_FUNC gpointer
-g_trash_stack_peek (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-
-  data = *stack_p;
-
-  return data;
-}
-G_INLINE_FUNC guint
-g_trash_stack_height (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-  guint i = 0;
-
-  for (data = *stack_p; data; data = data->next)
-    i++;
-
-  return i;
-}
-
-#endif  /* G_CAN_INLINE || __G_TRASH_STACK_C__ */
-
-G_END_DECLS
-
-#endif /* __G_UTILS_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gtree.h b/linux-x86/include/glib-2.0/glib/gtree.h
deleted file mode 100644
index 34cb8bb..0000000
--- a/linux-x86/include/glib-2.0/glib/gtree.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_TREE_H__
-#define __G_TREE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTree  GTree;
-
-typedef gboolean (*GTraverseFunc) (gpointer  key,
-                                   gpointer  value,
-                                   gpointer  data);
-
-/* Balanced binary trees
- */
-GLIB_AVAILABLE_IN_ALL
-GTree*   g_tree_new             (GCompareFunc      key_compare_func);
-GLIB_AVAILABLE_IN_ALL
-GTree*   g_tree_new_with_data   (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data);
-GLIB_AVAILABLE_IN_ALL
-GTree*   g_tree_new_full        (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data,
-                                 GDestroyNotify    key_destroy_func,
-                                 GDestroyNotify    value_destroy_func);
-GLIB_AVAILABLE_IN_ALL
-GTree*   g_tree_ref             (GTree            *tree);
-GLIB_AVAILABLE_IN_ALL
-void     g_tree_unref           (GTree            *tree);
-GLIB_AVAILABLE_IN_ALL
-void     g_tree_destroy         (GTree            *tree);
-GLIB_AVAILABLE_IN_ALL
-void     g_tree_insert          (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-GLIB_AVAILABLE_IN_ALL
-void     g_tree_replace         (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_tree_remove          (GTree            *tree,
-                                 gconstpointer     key);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_tree_steal           (GTree            *tree,
-                                 gconstpointer     key);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_tree_lookup          (GTree            *tree,
-                                 gconstpointer     key);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_tree_lookup_extended (GTree            *tree,
-                                 gconstpointer     lookup_key,
-                                 gpointer         *orig_key,
-                                 gpointer         *value);
-GLIB_AVAILABLE_IN_ALL
-void     g_tree_foreach         (GTree            *tree,
-                                 GTraverseFunc	   func,
-                                 gpointer	   user_data);
-
-GLIB_DEPRECATED
-void     g_tree_traverse        (GTree            *tree,
-                                 GTraverseFunc     traverse_func,
-                                 GTraverseType     traverse_type,
-                                 gpointer          user_data);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer g_tree_search          (GTree            *tree,
-                                 GCompareFunc      search_func,
-                                 gconstpointer     user_data);
-GLIB_AVAILABLE_IN_ALL
-gint     g_tree_height          (GTree            *tree);
-GLIB_AVAILABLE_IN_ALL
-gint     g_tree_nnodes          (GTree            *tree);
-
-G_END_DECLS
-
-#endif /* __G_TREE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gtypes.h b/linux-x86/include/glib-2.0/glib/gtypes.h
deleted file mode 100644
index c18e0bf..0000000
--- a/linux-x86/include/glib-2.0/glib/gtypes.h
+++ /dev/null
@@ -1,484 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_TYPES_H__
-#define __G_TYPES_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glibconfig.h>
-#include <glib/gmacros.h>
-#include <glib/gversionmacros.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-/* Provide type definitions for commonly used types.
- *  These are useful because a "gint8" can be adjusted
- *  to be 1 byte (8 bits) on all platforms. Similarly and
- *  more importantly, "gint32" can be adjusted to be
- *  4 bytes (32 bits) on all platforms.
- */
-
-typedef char   gchar;
-typedef short  gshort;
-typedef long   glong;
-typedef int    gint;
-typedef gint   gboolean;
-
-typedef unsigned char   guchar;
-typedef unsigned short  gushort;
-typedef unsigned long   gulong;
-typedef unsigned int    guint;
-
-typedef float   gfloat;
-typedef double  gdouble;
-
-/* Define min and max constants for the fixed size numerical types */
-#define G_MININT8	((gint8)  0x80)
-#define G_MAXINT8	((gint8)  0x7f)
-#define G_MAXUINT8	((guint8) 0xff)
-
-#define G_MININT16	((gint16)  0x8000)
-#define G_MAXINT16	((gint16)  0x7fff)
-#define G_MAXUINT16	((guint16) 0xffff)
-
-#define G_MININT32	((gint32)  0x80000000)
-#define G_MAXINT32	((gint32)  0x7fffffff)
-#define G_MAXUINT32	((guint32) 0xffffffff)
-
-#define G_MININT64	((gint64) G_GINT64_CONSTANT(0x8000000000000000))
-#define G_MAXINT64	G_GINT64_CONSTANT(0x7fffffffffffffff)
-#define G_MAXUINT64	G_GINT64_CONSTANT(0xffffffffffffffffU)
-
-typedef void* gpointer;
-typedef const void *gconstpointer;
-
-typedef gint            (*GCompareFunc)         (gconstpointer  a,
-                                                 gconstpointer  b);
-typedef gint            (*GCompareDataFunc)     (gconstpointer  a,
-                                                 gconstpointer  b,
-						 gpointer       user_data);
-typedef gboolean        (*GEqualFunc)           (gconstpointer  a,
-                                                 gconstpointer  b);
-typedef void            (*GDestroyNotify)       (gpointer       data);
-typedef void            (*GFunc)                (gpointer       data,
-                                                 gpointer       user_data);
-typedef guint           (*GHashFunc)            (gconstpointer  key);
-typedef void            (*GHFunc)               (gpointer       key,
-                                                 gpointer       value,
-                                                 gpointer       user_data);
-
-/**
- * GFreeFunc:
- * @data: a data pointer
- *
- * Declares a type of function which takes an arbitrary
- * data pointer argument and has no return value. It is
- * not currently used in GLib or GTK+.
- */
-typedef void            (*GFreeFunc)            (gpointer       data);
-
-/**
- * GTranslateFunc:
- * @str: the untranslated string
- * @data: user data specified when installing the function, e.g.
- *  in g_option_group_set_translate_func()
- * 
- * The type of functions which are used to translate user-visible
- * strings, for <option>--help</option> output.
- * 
- * Returns: a translation of the string for the current locale.
- *  The returned string is owned by GLib and must not be freed.
- */
-typedef const gchar *   (*GTranslateFunc)       (const gchar   *str,
-						 gpointer       data);
-
-
-/* Define some mathematical constants that aren't available
- * symbolically in some strict ISO C implementations.
- *
- * Note that the large number of digits used in these definitions
- * doesn't imply that GLib or current computers in general would be
- * able to handle floating point numbers with an accuracy like this.
- * It's mostly an exercise in futility and future proofing. For
- * extended precision floating point support, look somewhere else
- * than GLib.
- */
-#define G_E     2.7182818284590452353602874713526624977572470937000
-#define G_LN2   0.69314718055994530941723212145817656807550013436026
-#define G_LN10  2.3025850929940456840179914546843642076011014886288
-#define G_PI    3.1415926535897932384626433832795028841971693993751
-#define G_PI_2  1.5707963267948966192313216916397514420985846996876
-#define G_PI_4  0.78539816339744830961566084581987572104929234984378
-#define G_SQRT2 1.4142135623730950488016887242096980785696718753769
-
-/* Portable endian checks and conversions
- *
- * glibconfig.h defines G_BYTE_ORDER which expands to one of
- * the below macros.
- */
-#define G_LITTLE_ENDIAN 1234
-#define G_BIG_ENDIAN    4321
-#define G_PDP_ENDIAN    3412		/* unused, need specific PDP check */	
-
-
-/* Basic bit swapping functions
- */
-#define GUINT16_SWAP_LE_BE_CONSTANT(val)	((guint16) ( \
-    (guint16) ((guint16) (val) >> 8) |	\
-    (guint16) ((guint16) (val) << 8)))
-
-#define GUINT32_SWAP_LE_BE_CONSTANT(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x000000ffU) << 24) | \
-    (((guint32) (val) & (guint32) 0x0000ff00U) <<  8) | \
-    (((guint32) (val) & (guint32) 0x00ff0000U) >>  8) | \
-    (((guint32) (val) & (guint32) 0xff000000U) >> 24)))
-
-#define GUINT64_SWAP_LE_BE_CONSTANT(val)	((guint64) ( \
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00000000000000ffU)) << 56) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x000000000000ff00U)) << 40) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x0000000000ff0000U)) << 24) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00000000ff000000U)) <<  8) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x000000ff00000000U)) >>  8) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x0000ff0000000000U)) >> 24) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00ff000000000000U)) >> 40) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0xff00000000000000U)) >> 56)))
-
-/* Arch specific stuff for speed
- */
-#if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
-
-#  if __GNUC__ >= 4 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 3
-#    define GUINT32_SWAP_LE_BE(val) ((guint32) __builtin_bswap32 ((gint32) (val)))
-#    define GUINT64_SWAP_LE_BE(val) ((guint64) __builtin_bswap64 ((gint64) (val)))
-#  endif
-
-#  if defined (__i386__)
-#    define GUINT16_SWAP_LE_BE_IA32(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint16 __v, __x = ((guint16) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT16_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ ("rorw $8, %w0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x)				\
-		      : "cc");					\
-	    __v; }))
-#    if !defined (__i486__) && !defined (__i586__) \
-	&& !defined (__pentium__) && !defined (__i686__) \
-	&& !defined (__pentiumpro__) && !defined (__pentium4__)
-#       define GUINT32_SWAP_LE_BE_IA32(val) \
-	  (G_GNUC_EXTENSION					\
-	   ({ register guint32 __v, __x = ((guint32) (val));	\
-	      if (__builtin_constant_p (__x))			\
-		__v = GUINT32_SWAP_LE_BE_CONSTANT (__x);	\
-	      else						\
-		__asm__ ("rorw $8, %w0\n\t"			\
-			 "rorl $16, %0\n\t"			\
-			 "rorw $8, %w0"				\
-			 : "=r" (__v)				\
-			 : "0" (__x)				\
-			 : "cc");				\
-	      __v; }))
-#    else /* 486 and higher has bswap */
-#       define GUINT32_SWAP_LE_BE_IA32(val) \
-	  (G_GNUC_EXTENSION					\
-	   ({ register guint32 __v, __x = ((guint32) (val));	\
-	      if (__builtin_constant_p (__x))			\
-		__v = GUINT32_SWAP_LE_BE_CONSTANT (__x);	\
-	      else						\
-		__asm__ ("bswap %0"				\
-			 : "=r" (__v)				\
-			 : "0" (__x));				\
-	      __v; }))
-#    endif /* processor specific 32-bit stuff */
-#    define GUINT64_SWAP_LE_BE_IA32(val) \
-       (G_GNUC_EXTENSION						\
-	({ union { guint64 __ll;					\
-		   guint32 __l[2]; } __w, __r;				\
-	   __w.__ll = ((guint64) (val));				\
-	   if (__builtin_constant_p (__w.__ll))				\
-	     __r.__ll = GUINT64_SWAP_LE_BE_CONSTANT (__w.__ll);		\
-	   else								\
-	     {								\
-	       __r.__l[0] = GUINT32_SWAP_LE_BE (__w.__l[1]);		\
-	       __r.__l[1] = GUINT32_SWAP_LE_BE (__w.__l[0]);		\
-	     }								\
-	   __r.__ll; }))
-     /* Possibly just use the constant version and let gcc figure it out? */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA32 (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA32 (val))
-#    endif
-#  elif defined (__ia64__)
-#    define GUINT16_SWAP_LE_BE_IA64(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint16 __v, __x = ((guint16) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT16_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ __volatile__ ("shl %0 = %1, 48 ;;"		\
-				   "mux1 %0 = %0, @rev ;;"	\
-				    : "=r" (__v)		\
-				    : "r" (__x));		\
-	    __v; }))
-#    define GUINT32_SWAP_LE_BE_IA64(val) \
-       (G_GNUC_EXTENSION					\
-	 ({ register guint32 __v, __x = ((guint32) (val));	\
-	    if (__builtin_constant_p (__x))			\
-	      __v = GUINT32_SWAP_LE_BE_CONSTANT (__x);		\
-	    else						\
-	     __asm__ __volatile__ ("shl %0 = %1, 32 ;;"		\
-				   "mux1 %0 = %0, @rev ;;"	\
-				    : "=r" (__v)		\
-				    : "r" (__x));		\
-	    __v; }))
-#    define GUINT64_SWAP_LE_BE_IA64(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint64 __v, __x = ((guint64) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT64_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ __volatile__ ("mux1 %0 = %1, @rev ;;"	\
-				   : "=r" (__v)			\
-				   : "r" (__x));		\
-	   __v; }))
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA64 (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA64 (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA64 (val))
-#    endif
-#  elif defined (__x86_64__)
-#    define GUINT32_SWAP_LE_BE_X86_64(val) \
-       (G_GNUC_EXTENSION					\
-	 ({ register guint32 __v, __x = ((guint32) (val));	\
-	    if (__builtin_constant_p (__x))			\
-	      __v = GUINT32_SWAP_LE_BE_CONSTANT (__x);		\
-	    else						\
-	     __asm__ ("bswapl %0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x));				\
-	    __v; }))
-#    define GUINT64_SWAP_LE_BE_X86_64(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint64 __v, __x = ((guint64) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT64_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ ("bswapq %0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x));				\
-	   __v; }))
-     /* gcc seems to figure out optimal code for this on its own */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86_64 (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86_64 (val))
-#    endif
-#  else /* generic gcc */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT (val))
-#    endif
-#  endif
-#else /* generic */
-#  define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#  define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
-#  define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT (val))
-#endif /* generic */
-
-#define GUINT16_SWAP_LE_PDP(val)	((guint16) (val))
-#define GUINT16_SWAP_BE_PDP(val)	(GUINT16_SWAP_LE_BE (val))
-#define GUINT32_SWAP_LE_PDP(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x0000ffffU) << 16) | \
-    (((guint32) (val) & (guint32) 0xffff0000U) >> 16)))
-#define GUINT32_SWAP_BE_PDP(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x00ff00ffU) << 8) | \
-    (((guint32) (val) & (guint32) 0xff00ff00U) >> 8)))
-
-/* The G*_TO_?E() macros are defined in glibconfig.h.
- * The transformation is symmetric, so the FROM just maps to the TO.
- */
-#define GINT16_FROM_LE(val)	(GINT16_TO_LE (val))
-#define GUINT16_FROM_LE(val)	(GUINT16_TO_LE (val))
-#define GINT16_FROM_BE(val)	(GINT16_TO_BE (val))
-#define GUINT16_FROM_BE(val)	(GUINT16_TO_BE (val))
-#define GINT32_FROM_LE(val)	(GINT32_TO_LE (val))
-#define GUINT32_FROM_LE(val)	(GUINT32_TO_LE (val))
-#define GINT32_FROM_BE(val)	(GINT32_TO_BE (val))
-#define GUINT32_FROM_BE(val)	(GUINT32_TO_BE (val))
-
-#define GINT64_FROM_LE(val)	(GINT64_TO_LE (val))
-#define GUINT64_FROM_LE(val)	(GUINT64_TO_LE (val))
-#define GINT64_FROM_BE(val)	(GINT64_TO_BE (val))
-#define GUINT64_FROM_BE(val)	(GUINT64_TO_BE (val))
-
-#define GLONG_FROM_LE(val)	(GLONG_TO_LE (val))
-#define GULONG_FROM_LE(val)	(GULONG_TO_LE (val))
-#define GLONG_FROM_BE(val)	(GLONG_TO_BE (val))
-#define GULONG_FROM_BE(val)	(GULONG_TO_BE (val))
-
-#define GINT_FROM_LE(val)	(GINT_TO_LE (val))
-#define GUINT_FROM_LE(val)	(GUINT_TO_LE (val))
-#define GINT_FROM_BE(val)	(GINT_TO_BE (val))
-#define GUINT_FROM_BE(val)	(GUINT_TO_BE (val))
-
-#define GSIZE_FROM_LE(val)	(GSIZE_TO_LE (val))
-#define GSSIZE_FROM_LE(val)	(GSSIZE_TO_LE (val))
-#define GSIZE_FROM_BE(val)	(GSIZE_TO_BE (val))
-#define GSSIZE_FROM_BE(val)	(GSSIZE_TO_BE (val))
-
-
-/* Portable versions of host-network order stuff
- */
-#define g_ntohl(val) (GUINT32_FROM_BE (val))
-#define g_ntohs(val) (GUINT16_FROM_BE (val))
-#define g_htonl(val) (GUINT32_TO_BE (val))
-#define g_htons(val) (GUINT16_TO_BE (val))
-
-/* IEEE Standard 754 Single Precision Storage Format (gfloat):
- *
- *        31 30           23 22            0
- * +--------+---------------+---------------+
- * | s 1bit | e[30:23] 8bit | f[22:0] 23bit |
- * +--------+---------------+---------------+
- * B0------------------->B1------->B2-->B3-->
- *
- * IEEE Standard 754 Double Precision Storage Format (gdouble):
- *
- *        63 62            52 51            32   31            0
- * +--------+----------------+----------------+ +---------------+
- * | s 1bit | e[62:52] 11bit | f[51:32] 20bit | | f[31:0] 32bit |
- * +--------+----------------+----------------+ +---------------+
- * B0--------------->B1---------->B2--->B3---->  B4->B5->B6->B7->
- */
-/* subtract from biased_exponent to form base2 exponent (normal numbers) */
-typedef union  _GDoubleIEEE754	GDoubleIEEE754;
-typedef union  _GFloatIEEE754	GFloatIEEE754;
-#define G_IEEE754_FLOAT_BIAS	(127)
-#define G_IEEE754_DOUBLE_BIAS	(1023)
-/* multiply with base2 exponent to get base10 exponent (normal numbers) */
-#define G_LOG_2_BASE_10		(0.30102999566398119521)
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-union _GFloatIEEE754
-{
-  gfloat v_float;
-  struct {
-    guint mantissa : 23;
-    guint biased_exponent : 8;
-    guint sign : 1;
-  } mpn;
-};
-union _GDoubleIEEE754
-{
-  gdouble v_double;
-  struct {
-    guint mantissa_low : 32;
-    guint mantissa_high : 20;
-    guint biased_exponent : 11;
-    guint sign : 1;
-  } mpn;
-};
-#elif G_BYTE_ORDER == G_BIG_ENDIAN
-union _GFloatIEEE754
-{
-  gfloat v_float;
-  struct {
-    guint sign : 1;
-    guint biased_exponent : 8;
-    guint mantissa : 23;
-  } mpn;
-};
-union _GDoubleIEEE754
-{
-  gdouble v_double;
-  struct {
-    guint sign : 1;
-    guint biased_exponent : 11;
-    guint mantissa_high : 20;
-    guint mantissa_low : 32;
-  } mpn;
-};
-#else /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-#error unknown ENDIAN type
-#endif /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-
-typedef struct _GTimeVal                GTimeVal;
-
-struct _GTimeVal
-{
-  glong tv_sec;
-  glong tv_usec;
-};
-
-G_END_DECLS
-
-/* We prefix variable declarations so they can
- * properly get exported in Windows DLLs.
- */
-#ifndef GLIB_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GLIB_STATIC_COMPILATION
-#      define GLIB_VAR extern
-#    else /* !GLIB_STATIC_COMPILATION */
-#      ifdef GLIB_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GLIB_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GLIB_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GLIB_COMPILATION */
-#        define GLIB_VAR extern __declspec(dllimport)
-#      endif /* !GLIB_COMPILATION */
-#    endif /* !GLIB_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    define GLIB_VAR _GLIB_EXTERN
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GLIB_VAR */
-
-#endif /* __G_TYPES_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gunicode.h b/linux-x86/include/glib-2.0/glib/gunicode.h
deleted file mode 100644
index fdf1086..0000000
--- a/linux-x86/include/glib-2.0/glib/gunicode.h
+++ /dev/null
@@ -1,813 +0,0 @@
-/* gunicode.h - Unicode manipulation functions
- *
- *  Copyright (C) 1999, 2000 Tom Tromey
- *  Copyright 2000, 2005 Red Hat, Inc.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_UNICODE_H__
-#define __G_UNICODE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gerror.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * gunichar:
- *
- * A type which can hold any UTF-32 or UCS-4 character code,
- * also known as a Unicode code point.
- *
- * If you want to produce the UTF-8 representation of a #gunichar,
- * use g_ucs4_to_utf8(). See also g_utf8_to_ucs4() for the reverse
- * process.
- *
- * To print/scan values of this type as integer, use
- * %G_GINT32_MODIFIER and/or %G_GUINT32_FORMAT.
- *
- * The notation to express a Unicode code point in running text is
- * as a hexadecimal number with four to six digits and uppercase
- * letters, prefixed by the string "U+". Leading zeros are omitted,
- * unless the code point would have fewer than four hexadecimal digits.
- * For example, "U+0041 LATIN CAPITAL LETTER A". To print a code point
- * in the U+-notation, use the format string "U+\%04"G_GINT32_FORMAT"X".
- * To scan, use the format string "U+\%06"G_GINT32_FORMAT"X".
- *
- * |[
- * gunichar c;
- * sscanf ("U+0041", "U+%06"G_GINT32_FORMAT"X", &amp;c)
- * g_print ("Read U+%04"G_GINT32_FORMAT"X", c);
- * ]|
- */
-typedef guint32 gunichar;
-
-/**
- * gunichar2:
- *
- * A type which can hold any UTF-16 code
- * point<footnote id="utf16_surrogate_pairs">UTF-16 also has so called
- * <firstterm>surrogate pairs</firstterm> to encode characters beyond
- * the BMP as pairs of 16bit numbers. Surrogate pairs cannot be stored
- * in a single gunichar2 field, but all GLib functions accepting gunichar2
- * arrays will correctly interpret surrogate pairs.</footnote>.
- *
- * To print/scan values of this type to/from text you need to convert
- * to/from UTF-8, using g_utf16_to_utf8()/g_utf8_to_utf16().
- *
- * To print/scan values of this type as integer, use
- * %G_GINT16_MODIFIER and/or %G_GUINT16_FORMAT.
- */
-typedef guint16 gunichar2;
-
-/**
- * GUnicodeType:
- * @G_UNICODE_CONTROL: General category "Other, Control" (Cc)
- * @G_UNICODE_FORMAT: General category "Other, Format" (Cf)
- * @G_UNICODE_UNASSIGNED: General category "Other, Not Assigned" (Cn)
- * @G_UNICODE_PRIVATE_USE: General category "Other, Private Use" (Co)
- * @G_UNICODE_SURROGATE: General category "Other, Surrogate" (Cs)
- * @G_UNICODE_LOWERCASE_LETTER: General category "Letter, Lowercase" (Ll)
- * @G_UNICODE_MODIFIER_LETTER: General category "Letter, Modifier" (Lm)
- * @G_UNICODE_OTHER_LETTER: General category "Letter, Other" (Lo)
- * @G_UNICODE_TITLECASE_LETTER: General category "Letter, Titlecase" (Lt)
- * @G_UNICODE_UPPERCASE_LETTER: General category "Letter, Uppercase" (Lu)
- * @G_UNICODE_SPACING_MARK: General category "Mark, Spacing" (Mc)
- * @G_UNICODE_ENCLOSING_MARK: General category "Mark, Enclosing" (Me)
- * @G_UNICODE_NON_SPACING_MARK: General category "Mark, Nonspacing" (Mn)
- * @G_UNICODE_DECIMAL_NUMBER: General category "Number, Decimal Digit" (Nd)
- * @G_UNICODE_LETTER_NUMBER: General category "Number, Letter" (Nl)
- * @G_UNICODE_OTHER_NUMBER: General category "Number, Other" (No)
- * @G_UNICODE_CONNECT_PUNCTUATION: General category "Punctuation, Connector" (Pc)
- * @G_UNICODE_DASH_PUNCTUATION: General category "Punctuation, Dash" (Pd)
- * @G_UNICODE_CLOSE_PUNCTUATION: General category "Punctuation, Close" (Pe)
- * @G_UNICODE_FINAL_PUNCTUATION: General category "Punctuation, Final quote" (Pf)
- * @G_UNICODE_INITIAL_PUNCTUATION: General category "Punctuation, Initial quote" (Pi)
- * @G_UNICODE_OTHER_PUNCTUATION: General category "Punctuation, Other" (Po)
- * @G_UNICODE_OPEN_PUNCTUATION: General category "Punctuation, Open" (Ps)
- * @G_UNICODE_CURRENCY_SYMBOL: General category "Symbol, Currency" (Sc)
- * @G_UNICODE_MODIFIER_SYMBOL: General category "Symbol, Modifier" (Sk)
- * @G_UNICODE_MATH_SYMBOL: General category "Symbol, Math" (Sm)
- * @G_UNICODE_OTHER_SYMBOL: General category "Symbol, Other" (So)
- * @G_UNICODE_LINE_SEPARATOR: General category "Separator, Line" (Zl)
- * @G_UNICODE_PARAGRAPH_SEPARATOR: General category "Separator, Paragraph" (Zp)
- * @G_UNICODE_SPACE_SEPARATOR: General category "Separator, Space" (Zs)
- *
- * These are the possible character classifications from the
- * Unicode specification.
- * See <ulink url="http://www.unicode.org/Public/UNIDATA/UnicodeData.html">http://www.unicode.org/Public/UNIDATA/UnicodeData.html</ulink>.
- */
-typedef enum
-{
-  G_UNICODE_CONTROL,
-  G_UNICODE_FORMAT,
-  G_UNICODE_UNASSIGNED,
-  G_UNICODE_PRIVATE_USE,
-  G_UNICODE_SURROGATE,
-  G_UNICODE_LOWERCASE_LETTER,
-  G_UNICODE_MODIFIER_LETTER,
-  G_UNICODE_OTHER_LETTER,
-  G_UNICODE_TITLECASE_LETTER,
-  G_UNICODE_UPPERCASE_LETTER,
-  G_UNICODE_SPACING_MARK,
-  G_UNICODE_ENCLOSING_MARK,
-  G_UNICODE_NON_SPACING_MARK,
-  G_UNICODE_DECIMAL_NUMBER,
-  G_UNICODE_LETTER_NUMBER,
-  G_UNICODE_OTHER_NUMBER,
-  G_UNICODE_CONNECT_PUNCTUATION,
-  G_UNICODE_DASH_PUNCTUATION,
-  G_UNICODE_CLOSE_PUNCTUATION,
-  G_UNICODE_FINAL_PUNCTUATION,
-  G_UNICODE_INITIAL_PUNCTUATION,
-  G_UNICODE_OTHER_PUNCTUATION,
-  G_UNICODE_OPEN_PUNCTUATION,
-  G_UNICODE_CURRENCY_SYMBOL,
-  G_UNICODE_MODIFIER_SYMBOL,
-  G_UNICODE_MATH_SYMBOL,
-  G_UNICODE_OTHER_SYMBOL,
-  G_UNICODE_LINE_SEPARATOR,
-  G_UNICODE_PARAGRAPH_SEPARATOR,
-  G_UNICODE_SPACE_SEPARATOR
-} GUnicodeType;
-
-/**
- * G_UNICODE_COMBINING_MARK:
- *
- * Older name for %G_UNICODE_SPACING_MARK.
- *
- * Deprecated: 2.30: Use %G_UNICODE_SPACING_MARK.
- */
-#ifndef G_DISABLE_DEPRECATED
-#define G_UNICODE_COMBINING_MARK G_UNICODE_SPACING_MARK
-#endif
-
-/**
- * GUnicodeBreakType:
- * @G_UNICODE_BREAK_MANDATORY: Mandatory Break (BK)
- * @G_UNICODE_BREAK_CARRIAGE_RETURN: Carriage Return (CR)
- * @G_UNICODE_BREAK_LINE_FEED: Line Feed (LF)
- * @G_UNICODE_BREAK_COMBINING_MARK: Attached Characters and Combining Marks (CM)
- * @G_UNICODE_BREAK_SURROGATE: Surrogates (SG)
- * @G_UNICODE_BREAK_ZERO_WIDTH_SPACE: Zero Width Space (ZW)
- * @G_UNICODE_BREAK_INSEPARABLE: Inseparable (IN)
- * @G_UNICODE_BREAK_NON_BREAKING_GLUE: Non-breaking ("Glue") (GL)
- * @G_UNICODE_BREAK_CONTINGENT: Contingent Break Opportunity (CB)
- * @G_UNICODE_BREAK_SPACE: Space (SP)
- * @G_UNICODE_BREAK_AFTER: Break Opportunity After (BA)
- * @G_UNICODE_BREAK_BEFORE: Break Opportunity Before (BB)
- * @G_UNICODE_BREAK_BEFORE_AND_AFTER: Break Opportunity Before and After (B2)
- * @G_UNICODE_BREAK_HYPHEN: Hyphen (HY)
- * @G_UNICODE_BREAK_NON_STARTER: Nonstarter (NS)
- * @G_UNICODE_BREAK_OPEN_PUNCTUATION: Opening Punctuation (OP)
- * @G_UNICODE_BREAK_CLOSE_PUNCTUATION: Closing Punctuation (CL)
- * @G_UNICODE_BREAK_QUOTATION: Ambiguous Quotation (QU)
- * @G_UNICODE_BREAK_EXCLAMATION: Exclamation/Interrogation (EX)
- * @G_UNICODE_BREAK_IDEOGRAPHIC: Ideographic (ID)
- * @G_UNICODE_BREAK_NUMERIC: Numeric (NU)
- * @G_UNICODE_BREAK_INFIX_SEPARATOR: Infix Separator (Numeric) (IS)
- * @G_UNICODE_BREAK_SYMBOL: Symbols Allowing Break After (SY)
- * @G_UNICODE_BREAK_ALPHABETIC: Ordinary Alphabetic and Symbol Characters (AL)
- * @G_UNICODE_BREAK_PREFIX: Prefix (Numeric) (PR)
- * @G_UNICODE_BREAK_POSTFIX: Postfix (Numeric) (PO)
- * @G_UNICODE_BREAK_COMPLEX_CONTEXT: Complex Content Dependent (South East Asian) (SA)
- * @G_UNICODE_BREAK_AMBIGUOUS: Ambiguous (Alphabetic or Ideographic) (AI)
- * @G_UNICODE_BREAK_UNKNOWN: Unknown (XX)
- * @G_UNICODE_BREAK_NEXT_LINE: Next Line (NL)
- * @G_UNICODE_BREAK_WORD_JOINER: Word Joiner (WJ)
- * @G_UNICODE_BREAK_HANGUL_L_JAMO: Hangul L Jamo (JL)
- * @G_UNICODE_BREAK_HANGUL_V_JAMO: Hangul V Jamo (JV)
- * @G_UNICODE_BREAK_HANGUL_T_JAMO: Hangul T Jamo (JT)
- * @G_UNICODE_BREAK_HANGUL_LV_SYLLABLE: Hangul LV Syllable (H2)
- * @G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE: Hangul LVT Syllable (H3)
- * @G_UNICODE_BREAK_CLOSE_PARANTHESIS: Closing Parenthesis (CP). Since 2.28
- * @G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER: Conditional Japanese Starter (CJ). Since: 2.32
- * @G_UNICODE_BREAK_HEBREW_LETTER: Hebrew Letter (HL). Since: 2.32
- * @G_UNICODE_BREAK_REGIONAL_INDICATOR: Regional Indicator (RI). Since: 2.36
- *
- * These are the possible line break classifications.
- *
- * Since new unicode versions may add new types here, applications should be ready 
- * to handle unknown values. They may be regarded as %G_UNICODE_BREAK_UNKNOWN.
- *
- * See <ulink url="http://www.unicode.org/unicode/reports/tr14/">http://www.unicode.org/unicode/reports/tr14/</ulink>.
- */
-typedef enum
-{
-  G_UNICODE_BREAK_MANDATORY,
-  G_UNICODE_BREAK_CARRIAGE_RETURN,
-  G_UNICODE_BREAK_LINE_FEED,
-  G_UNICODE_BREAK_COMBINING_MARK,
-  G_UNICODE_BREAK_SURROGATE,
-  G_UNICODE_BREAK_ZERO_WIDTH_SPACE,
-  G_UNICODE_BREAK_INSEPARABLE,
-  G_UNICODE_BREAK_NON_BREAKING_GLUE,
-  G_UNICODE_BREAK_CONTINGENT,
-  G_UNICODE_BREAK_SPACE,
-  G_UNICODE_BREAK_AFTER,
-  G_UNICODE_BREAK_BEFORE,
-  G_UNICODE_BREAK_BEFORE_AND_AFTER,
-  G_UNICODE_BREAK_HYPHEN,
-  G_UNICODE_BREAK_NON_STARTER,
-  G_UNICODE_BREAK_OPEN_PUNCTUATION,
-  G_UNICODE_BREAK_CLOSE_PUNCTUATION,
-  G_UNICODE_BREAK_QUOTATION,
-  G_UNICODE_BREAK_EXCLAMATION,
-  G_UNICODE_BREAK_IDEOGRAPHIC,
-  G_UNICODE_BREAK_NUMERIC,
-  G_UNICODE_BREAK_INFIX_SEPARATOR,
-  G_UNICODE_BREAK_SYMBOL,
-  G_UNICODE_BREAK_ALPHABETIC,
-  G_UNICODE_BREAK_PREFIX,
-  G_UNICODE_BREAK_POSTFIX,
-  G_UNICODE_BREAK_COMPLEX_CONTEXT,
-  G_UNICODE_BREAK_AMBIGUOUS,
-  G_UNICODE_BREAK_UNKNOWN,
-  G_UNICODE_BREAK_NEXT_LINE,
-  G_UNICODE_BREAK_WORD_JOINER,
-  G_UNICODE_BREAK_HANGUL_L_JAMO,
-  G_UNICODE_BREAK_HANGUL_V_JAMO,
-  G_UNICODE_BREAK_HANGUL_T_JAMO,
-  G_UNICODE_BREAK_HANGUL_LV_SYLLABLE,
-  G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
-  G_UNICODE_BREAK_CLOSE_PARANTHESIS,
-  G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER,
-  G_UNICODE_BREAK_HEBREW_LETTER,
-  G_UNICODE_BREAK_REGIONAL_INDICATOR
-} GUnicodeBreakType;
-
-/**
- * GUnicodeScript:
- * @G_UNICODE_SCRIPT_INVALID_CODE:
- *                               a value never returned from g_unichar_get_script()
- * @G_UNICODE_SCRIPT_COMMON:     a character used by multiple different scripts
- * @G_UNICODE_SCRIPT_INHERITED:  a mark glyph that takes its script from the
- * i                             base glyph to which it is attached
- * @G_UNICODE_SCRIPT_ARABIC:     Arabic
- * @G_UNICODE_SCRIPT_ARMENIAN:   Armenian
- * @G_UNICODE_SCRIPT_BENGALI:    Bengali
- * @G_UNICODE_SCRIPT_BOPOMOFO:   Bopomofo
- * @G_UNICODE_SCRIPT_CHEROKEE:   Cherokee
- * @G_UNICODE_SCRIPT_COPTIC:     Coptic
- * @G_UNICODE_SCRIPT_CYRILLIC:   Cyrillic
- * @G_UNICODE_SCRIPT_DESERET:    Deseret
- * @G_UNICODE_SCRIPT_DEVANAGARI: Devanagari
- * @G_UNICODE_SCRIPT_ETHIOPIC:   Ethiopic
- * @G_UNICODE_SCRIPT_GEORGIAN:   Georgian
- * @G_UNICODE_SCRIPT_GOTHIC:     Gothic
- * @G_UNICODE_SCRIPT_GREEK:      Greek
- * @G_UNICODE_SCRIPT_GUJARATI:   Gujarati
- * @G_UNICODE_SCRIPT_GURMUKHI:   Gurmukhi
- * @G_UNICODE_SCRIPT_HAN:        Han
- * @G_UNICODE_SCRIPT_HANGUL:     Hangul
- * @G_UNICODE_SCRIPT_HEBREW:     Hebrew
- * @G_UNICODE_SCRIPT_HIRAGANA:   Hiragana
- * @G_UNICODE_SCRIPT_KANNADA:    Kannada
- * @G_UNICODE_SCRIPT_KATAKANA:   Katakana
- * @G_UNICODE_SCRIPT_KHMER:      Khmer
- * @G_UNICODE_SCRIPT_LAO:        Lao
- * @G_UNICODE_SCRIPT_LATIN:      Latin
- * @G_UNICODE_SCRIPT_MALAYALAM:  Malayalam
- * @G_UNICODE_SCRIPT_MONGOLIAN:  Mongolian
- * @G_UNICODE_SCRIPT_MYANMAR:    Myanmar
- * @G_UNICODE_SCRIPT_OGHAM:      Ogham
- * @G_UNICODE_SCRIPT_OLD_ITALIC: Old Italic
- * @G_UNICODE_SCRIPT_ORIYA:      Oriya
- * @G_UNICODE_SCRIPT_RUNIC:      Runic
- * @G_UNICODE_SCRIPT_SINHALA:    Sinhala
- * @G_UNICODE_SCRIPT_SYRIAC:     Syriac
- * @G_UNICODE_SCRIPT_TAMIL:      Tamil
- * @G_UNICODE_SCRIPT_TELUGU:     Telugu
- * @G_UNICODE_SCRIPT_THAANA:     Thaana
- * @G_UNICODE_SCRIPT_THAI:       Thai
- * @G_UNICODE_SCRIPT_TIBETAN:    Tibetan
- * @G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL:
- *                               Canadian Aboriginal
- * @G_UNICODE_SCRIPT_YI:         Yi
- * @G_UNICODE_SCRIPT_TAGALOG:    Tagalog
- * @G_UNICODE_SCRIPT_HANUNOO:    Hanunoo
- * @G_UNICODE_SCRIPT_BUHID:      Buhid
- * @G_UNICODE_SCRIPT_TAGBANWA:   Tagbanwa
- * @G_UNICODE_SCRIPT_BRAILLE:    Braille
- * @G_UNICODE_SCRIPT_CYPRIOT:    Cypriot
- * @G_UNICODE_SCRIPT_LIMBU:      Limbu
- * @G_UNICODE_SCRIPT_OSMANYA:    Osmanya
- * @G_UNICODE_SCRIPT_SHAVIAN:    Shavian
- * @G_UNICODE_SCRIPT_LINEAR_B:   Linear B
- * @G_UNICODE_SCRIPT_TAI_LE:     Tai Le
- * @G_UNICODE_SCRIPT_UGARITIC:   Ugaritic
- * @G_UNICODE_SCRIPT_NEW_TAI_LUE:
- *                               New Tai Lue
- * @G_UNICODE_SCRIPT_BUGINESE:   Buginese
- * @G_UNICODE_SCRIPT_GLAGOLITIC: Glagolitic
- * @G_UNICODE_SCRIPT_TIFINAGH:   Tifinagh
- * @G_UNICODE_SCRIPT_SYLOTI_NAGRI:
- *                               Syloti Nagri
- * @G_UNICODE_SCRIPT_OLD_PERSIAN:
- *                               Old Persian
- * @G_UNICODE_SCRIPT_KHAROSHTHI: Kharoshthi
- * @G_UNICODE_SCRIPT_UNKNOWN:    an unassigned code point
- * @G_UNICODE_SCRIPT_BALINESE:   Balinese
- * @G_UNICODE_SCRIPT_CUNEIFORM:  Cuneiform
- * @G_UNICODE_SCRIPT_PHOENICIAN: Phoenician
- * @G_UNICODE_SCRIPT_PHAGS_PA:   Phags-pa
- * @G_UNICODE_SCRIPT_NKO:        N'Ko
- * @G_UNICODE_SCRIPT_KAYAH_LI:   Kayah Li. Since 2.16.3
- * @G_UNICODE_SCRIPT_LEPCHA:     Lepcha. Since 2.16.3
- * @G_UNICODE_SCRIPT_REJANG:     Rejang. Since 2.16.3
- * @G_UNICODE_SCRIPT_SUNDANESE:  Sundanese. Since 2.16.3
- * @G_UNICODE_SCRIPT_SAURASHTRA: Saurashtra. Since 2.16.3
- * @G_UNICODE_SCRIPT_CHAM:       Cham. Since 2.16.3
- * @G_UNICODE_SCRIPT_OL_CHIKI:   Ol Chiki. Since 2.16.3
- * @G_UNICODE_SCRIPT_VAI:        Vai. Since 2.16.3
- * @G_UNICODE_SCRIPT_CARIAN:     Carian. Since 2.16.3
- * @G_UNICODE_SCRIPT_LYCIAN:     Lycian. Since 2.16.3
- * @G_UNICODE_SCRIPT_LYDIAN:     Lydian. Since 2.16.3
- * @G_UNICODE_SCRIPT_AVESTAN:    Avestan. Since 2.26
- * @G_UNICODE_SCRIPT_BAMUM:      Bamum. Since 2.26
- * @G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS:
- *                               Egyptian Hieroglpyhs. Since 2.26
- * @G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC:
- *                               Imperial Aramaic. Since 2.26
- * @G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI:
- *                               Inscriptional Pahlavi. Since 2.26
- * @G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN:
- *                               Inscriptional Parthian. Since 2.26
- * @G_UNICODE_SCRIPT_JAVANESE:   Javanese. Since 2.26
- * @G_UNICODE_SCRIPT_KAITHI:     Kaithi. Since 2.26
- * @G_UNICODE_SCRIPT_LISU:       Lisu. Since 2.26
- * @G_UNICODE_SCRIPT_MEETEI_MAYEK:
- *                               Meetei Mayek. Since 2.26
- * @G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN:
- *                               Old South Arabian. Since 2.26
- * @G_UNICODE_SCRIPT_OLD_TURKIC: Old Turkic. Since 2.28
- * @G_UNICODE_SCRIPT_SAMARITAN:  Samaritan. Since 2.26
- * @G_UNICODE_SCRIPT_TAI_THAM:   Tai Tham. Since 2.26
- * @G_UNICODE_SCRIPT_TAI_VIET:   Tai Viet. Since 2.26
- * @G_UNICODE_SCRIPT_BATAK:      Batak. Since 2.28
- * @G_UNICODE_SCRIPT_BRAHMI:     Brahmi. Since 2.28
- * @G_UNICODE_SCRIPT_MANDAIC:    Mandaic. Since 2.28
- * @G_UNICODE_SCRIPT_CHAKMA:               Chakma. Since: 2.32
- * @G_UNICODE_SCRIPT_MEROITIC_CURSIVE:     Meroitic Cursive. Since: 2.32
- * @G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS: Meroitic Hieroglyphs. Since: 2.32
- * @G_UNICODE_SCRIPT_MIAO:                 Miao. Since: 2.32
- * @G_UNICODE_SCRIPT_SHARADA:              Sharada. Since: 2.32
- * @G_UNICODE_SCRIPT_SORA_SOMPENG:         Sora Sompeng. Since: 2.32
- * @G_UNICODE_SCRIPT_TAKRI:                Takri. Since: 2.32
- *
- * The #GUnicodeScript enumeration identifies different writing
- * systems. The values correspond to the names as defined in the
- * Unicode standard. The enumeration has been added in GLib 2.14,
- * and is interchangeable with #PangoScript.
- *
- * Note that new types may be added in the future. Applications
- * should be ready to handle unknown values.
- * See <ulink
- * url="http://www.unicode.org/reports/tr24/">Unicode Standard Annex
- * #24: Script names</ulink>.
- */
-typedef enum
-{                         /* ISO 15924 code */
-  G_UNICODE_SCRIPT_INVALID_CODE = -1,
-  G_UNICODE_SCRIPT_COMMON       = 0,   /* Zyyy */
-  G_UNICODE_SCRIPT_INHERITED,          /* Zinh (Qaai) */
-  G_UNICODE_SCRIPT_ARABIC,             /* Arab */
-  G_UNICODE_SCRIPT_ARMENIAN,           /* Armn */
-  G_UNICODE_SCRIPT_BENGALI,            /* Beng */
-  G_UNICODE_SCRIPT_BOPOMOFO,           /* Bopo */
-  G_UNICODE_SCRIPT_CHEROKEE,           /* Cher */
-  G_UNICODE_SCRIPT_COPTIC,             /* Copt (Qaac) */
-  G_UNICODE_SCRIPT_CYRILLIC,           /* Cyrl (Cyrs) */
-  G_UNICODE_SCRIPT_DESERET,            /* Dsrt */
-  G_UNICODE_SCRIPT_DEVANAGARI,         /* Deva */
-  G_UNICODE_SCRIPT_ETHIOPIC,           /* Ethi */
-  G_UNICODE_SCRIPT_GEORGIAN,           /* Geor (Geon, Geoa) */
-  G_UNICODE_SCRIPT_GOTHIC,             /* Goth */
-  G_UNICODE_SCRIPT_GREEK,              /* Grek */
-  G_UNICODE_SCRIPT_GUJARATI,           /* Gujr */
-  G_UNICODE_SCRIPT_GURMUKHI,           /* Guru */
-  G_UNICODE_SCRIPT_HAN,                /* Hani */
-  G_UNICODE_SCRIPT_HANGUL,             /* Hang */
-  G_UNICODE_SCRIPT_HEBREW,             /* Hebr */
-  G_UNICODE_SCRIPT_HIRAGANA,           /* Hira */
-  G_UNICODE_SCRIPT_KANNADA,            /* Knda */
-  G_UNICODE_SCRIPT_KATAKANA,           /* Kana */
-  G_UNICODE_SCRIPT_KHMER,              /* Khmr */
-  G_UNICODE_SCRIPT_LAO,                /* Laoo */
-  G_UNICODE_SCRIPT_LATIN,              /* Latn (Latf, Latg) */
-  G_UNICODE_SCRIPT_MALAYALAM,          /* Mlym */
-  G_UNICODE_SCRIPT_MONGOLIAN,          /* Mong */
-  G_UNICODE_SCRIPT_MYANMAR,            /* Mymr */
-  G_UNICODE_SCRIPT_OGHAM,              /* Ogam */
-  G_UNICODE_SCRIPT_OLD_ITALIC,         /* Ital */
-  G_UNICODE_SCRIPT_ORIYA,              /* Orya */
-  G_UNICODE_SCRIPT_RUNIC,              /* Runr */
-  G_UNICODE_SCRIPT_SINHALA,            /* Sinh */
-  G_UNICODE_SCRIPT_SYRIAC,             /* Syrc (Syrj, Syrn, Syre) */
-  G_UNICODE_SCRIPT_TAMIL,              /* Taml */
-  G_UNICODE_SCRIPT_TELUGU,             /* Telu */
-  G_UNICODE_SCRIPT_THAANA,             /* Thaa */
-  G_UNICODE_SCRIPT_THAI,               /* Thai */
-  G_UNICODE_SCRIPT_TIBETAN,            /* Tibt */
-  G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL, /* Cans */
-  G_UNICODE_SCRIPT_YI,                 /* Yiii */
-  G_UNICODE_SCRIPT_TAGALOG,            /* Tglg */
-  G_UNICODE_SCRIPT_HANUNOO,            /* Hano */
-  G_UNICODE_SCRIPT_BUHID,              /* Buhd */
-  G_UNICODE_SCRIPT_TAGBANWA,           /* Tagb */
-
-  /* Unicode-4.0 additions */
-  G_UNICODE_SCRIPT_BRAILLE,            /* Brai */
-  G_UNICODE_SCRIPT_CYPRIOT,            /* Cprt */
-  G_UNICODE_SCRIPT_LIMBU,              /* Limb */
-  G_UNICODE_SCRIPT_OSMANYA,            /* Osma */
-  G_UNICODE_SCRIPT_SHAVIAN,            /* Shaw */
-  G_UNICODE_SCRIPT_LINEAR_B,           /* Linb */
-  G_UNICODE_SCRIPT_TAI_LE,             /* Tale */
-  G_UNICODE_SCRIPT_UGARITIC,           /* Ugar */
-
-  /* Unicode-4.1 additions */
-  G_UNICODE_SCRIPT_NEW_TAI_LUE,        /* Talu */
-  G_UNICODE_SCRIPT_BUGINESE,           /* Bugi */
-  G_UNICODE_SCRIPT_GLAGOLITIC,         /* Glag */
-  G_UNICODE_SCRIPT_TIFINAGH,           /* Tfng */
-  G_UNICODE_SCRIPT_SYLOTI_NAGRI,       /* Sylo */
-  G_UNICODE_SCRIPT_OLD_PERSIAN,        /* Xpeo */
-  G_UNICODE_SCRIPT_KHAROSHTHI,         /* Khar */
-
-  /* Unicode-5.0 additions */
-  G_UNICODE_SCRIPT_UNKNOWN,            /* Zzzz */
-  G_UNICODE_SCRIPT_BALINESE,           /* Bali */
-  G_UNICODE_SCRIPT_CUNEIFORM,          /* Xsux */
-  G_UNICODE_SCRIPT_PHOENICIAN,         /* Phnx */
-  G_UNICODE_SCRIPT_PHAGS_PA,           /* Phag */
-  G_UNICODE_SCRIPT_NKO,                /* Nkoo */
-
-  /* Unicode-5.1 additions */
-  G_UNICODE_SCRIPT_KAYAH_LI,           /* Kali */
-  G_UNICODE_SCRIPT_LEPCHA,             /* Lepc */
-  G_UNICODE_SCRIPT_REJANG,             /* Rjng */
-  G_UNICODE_SCRIPT_SUNDANESE,          /* Sund */
-  G_UNICODE_SCRIPT_SAURASHTRA,         /* Saur */
-  G_UNICODE_SCRIPT_CHAM,               /* Cham */
-  G_UNICODE_SCRIPT_OL_CHIKI,           /* Olck */
-  G_UNICODE_SCRIPT_VAI,                /* Vaii */
-  G_UNICODE_SCRIPT_CARIAN,             /* Cari */
-  G_UNICODE_SCRIPT_LYCIAN,             /* Lyci */
-  G_UNICODE_SCRIPT_LYDIAN,             /* Lydi */
-
-  /* Unicode-5.2 additions */
-  G_UNICODE_SCRIPT_AVESTAN,                /* Avst */
-  G_UNICODE_SCRIPT_BAMUM,                  /* Bamu */
-  G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS,   /* Egyp */
-  G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC,       /* Armi */
-  G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI,  /* Phli */
-  G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN, /* Prti */
-  G_UNICODE_SCRIPT_JAVANESE,               /* Java */
-  G_UNICODE_SCRIPT_KAITHI,                 /* Kthi */
-  G_UNICODE_SCRIPT_LISU,                   /* Lisu */
-  G_UNICODE_SCRIPT_MEETEI_MAYEK,           /* Mtei */
-  G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN,      /* Sarb */
-  G_UNICODE_SCRIPT_OLD_TURKIC,             /* Orkh */
-  G_UNICODE_SCRIPT_SAMARITAN,              /* Samr */
-  G_UNICODE_SCRIPT_TAI_THAM,               /* Lana */
-  G_UNICODE_SCRIPT_TAI_VIET,               /* Tavt */
-
-  /* Unicode-6.0 additions */
-  G_UNICODE_SCRIPT_BATAK,                  /* Batk */
-  G_UNICODE_SCRIPT_BRAHMI,                 /* Brah */
-  G_UNICODE_SCRIPT_MANDAIC,                /* Mand */
-
-  /* Unicode-6.1 additions */
-  G_UNICODE_SCRIPT_CHAKMA,                 /* Cakm */
-  G_UNICODE_SCRIPT_MEROITIC_CURSIVE,       /* Merc */
-  G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS,   /* Mero */
-  G_UNICODE_SCRIPT_MIAO,                   /* Plrd */
-  G_UNICODE_SCRIPT_SHARADA,                /* Shrd */
-  G_UNICODE_SCRIPT_SORA_SOMPENG,           /* Sora */
-  G_UNICODE_SCRIPT_TAKRI                   /* Takr */
-} GUnicodeScript;
-
-GLIB_AVAILABLE_IN_ALL
-guint32        g_unicode_script_to_iso15924   (GUnicodeScript script);
-GLIB_AVAILABLE_IN_ALL
-GUnicodeScript g_unicode_script_from_iso15924 (guint32        iso15924);
-
-/* These are all analogs of the <ctype.h> functions.
- */
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_isalnum   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_isalpha   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_iscntrl   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_isdigit   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_isgraph   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_islower   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_isprint   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_ispunct   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_isspace   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_isupper   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_isxdigit  (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_istitle   (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_isdefined (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_iswide    (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_iswide_cjk(gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_iszerowidth(gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_ismark    (gunichar c) G_GNUC_CONST;
-
-/* More <ctype.h> functions.  These convert between the three cases.
- * See the Unicode book to understand title case.  */
-GLIB_AVAILABLE_IN_ALL
-gunichar g_unichar_toupper (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gunichar g_unichar_tolower (gunichar c) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gunichar g_unichar_totitle (gunichar c) G_GNUC_CONST;
-
-/* If C is a digit (according to 'g_unichar_isdigit'), then return its
-   numeric value.  Otherwise return -1.  */
-GLIB_AVAILABLE_IN_ALL
-gint g_unichar_digit_value (gunichar c) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gint g_unichar_xdigit_value (gunichar c) G_GNUC_CONST;
-
-/* Return the Unicode character type of a given character.  */
-GLIB_AVAILABLE_IN_ALL
-GUnicodeType g_unichar_type (gunichar c) G_GNUC_CONST;
-
-/* Return the line break property for a given character */
-GLIB_AVAILABLE_IN_ALL
-GUnicodeBreakType g_unichar_break_type (gunichar c) G_GNUC_CONST;
-
-/* Returns the combining class for a given character */
-GLIB_AVAILABLE_IN_ALL
-gint g_unichar_combining_class (gunichar uc) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_get_mirror_char (gunichar ch,
-                                    gunichar *mirrored_ch);
-
-GLIB_AVAILABLE_IN_ALL
-GUnicodeScript g_unichar_get_script (gunichar ch) G_GNUC_CONST;
-
-/* Validate a Unicode character */
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_validate (gunichar ch) G_GNUC_CONST;
-
-/* Pairwise canonical compose/decompose */
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_compose (gunichar  a,
-                            gunichar  b,
-                            gunichar *ch);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_unichar_decompose (gunichar  ch,
-                              gunichar *a,
-                              gunichar *b);
-
-GLIB_AVAILABLE_IN_ALL
-gsize g_unichar_fully_decompose (gunichar  ch,
-                                 gboolean  compat,
-                                 gunichar *result,
-                                 gsize     result_len);
-
-/**
- * G_UNICHAR_MAX_DECOMPOSITION_LENGTH:
- *
- * The maximum length (in codepoints) of a compatibility or canonical
- * decomposition of a single Unicode character.
- *
- * This is as defined by Unicode 6.1.
- *
- * Since: 2.32
- */
-#define G_UNICHAR_MAX_DECOMPOSITION_LENGTH 18 /* codepoints */
-
-/* Compute canonical ordering of a string in-place.  This rearranges
-   decomposed characters in the string according to their combining
-   classes.  See the Unicode manual for more information.  */
-GLIB_AVAILABLE_IN_ALL
-void g_unicode_canonical_ordering (gunichar *string,
-                                   gsize     len);
-
-
-GLIB_DEPRECATED_IN_2_30
-gunichar *g_unicode_canonical_decomposition (gunichar  ch,
-                                             gsize    *result_len) G_GNUC_MALLOC;
-
-/* Array of skip-bytes-per-initial character.
- */
-GLIB_VAR const gchar * const g_utf8_skip;
-
-/**
- * g_utf8_next_char:
- * @p: Pointer to the start of a valid UTF-8 character
- *
- * Skips to the next character in a UTF-8 string. The string must be
- * valid; this macro is as fast as possible, and has no error-checking.
- * You would use this macro to iterate over a string character by
- * character. The macro returns the start of the next UTF-8 character.
- * Before using this macro, use g_utf8_validate() to validate strings
- * that may contain invalid UTF-8.
- */
-#define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(const guchar *)(p)])
-
-GLIB_AVAILABLE_IN_ALL
-gunichar g_utf8_get_char           (const gchar  *p) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-gunichar g_utf8_get_char_validated (const  gchar *p,
-                                    gssize        max_len) G_GNUC_PURE;
-
-GLIB_AVAILABLE_IN_ALL
-gchar*   g_utf8_offset_to_pointer (const gchar *str,
-                                   glong        offset) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-glong    g_utf8_pointer_to_offset (const gchar *str,
-                                   const gchar *pos) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-gchar*   g_utf8_prev_char         (const gchar *p) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-gchar*   g_utf8_find_next_char    (const gchar *p,
-                                   const gchar *end) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-gchar*   g_utf8_find_prev_char    (const gchar *str,
-                                   const gchar *p) G_GNUC_PURE;
-
-GLIB_AVAILABLE_IN_ALL
-glong    g_utf8_strlen            (const gchar *p,
-                                   gssize       max) G_GNUC_PURE;
-
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_utf8_substring         (const gchar *str,
-                                   glong        start_pos,
-                                   glong        end_pos) G_GNUC_MALLOC;
-
-GLIB_AVAILABLE_IN_ALL
-gchar   *g_utf8_strncpy           (gchar       *dest,
-                                   const gchar *src,
-                                   gsize        n);
-
-/* Find the UTF-8 character corresponding to ch, in string p. These
-   functions are equivalants to strchr and strrchr */
-GLIB_AVAILABLE_IN_ALL
-gchar* g_utf8_strchr  (const gchar *p,
-                       gssize       len,
-                       gunichar     c);
-GLIB_AVAILABLE_IN_ALL
-gchar* g_utf8_strrchr (const gchar *p,
-                       gssize       len,
-                       gunichar     c);
-GLIB_AVAILABLE_IN_ALL
-gchar* g_utf8_strreverse (const gchar *str,
-                          gssize len);
-
-GLIB_AVAILABLE_IN_ALL
-gunichar2 *g_utf8_to_utf16     (const gchar      *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gunichar * g_utf8_to_ucs4      (const gchar      *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gunichar * g_utf8_to_ucs4_fast (const gchar      *str,
-                                glong             len,
-                                glong            *items_written) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gunichar * g_utf16_to_ucs4     (const gunichar2  *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar*     g_utf16_to_utf8     (const gunichar2  *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gunichar2 *g_ucs4_to_utf16     (const gunichar   *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar*     g_ucs4_to_utf8      (const gunichar   *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-
-GLIB_AVAILABLE_IN_ALL
-gint      g_unichar_to_utf8 (gunichar    c,
-                             gchar      *outbuf);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_utf8_validate (const gchar  *str,
-                          gssize        max_len,
-                          const gchar **end);
-
-GLIB_AVAILABLE_IN_ALL
-gchar *g_utf8_strup   (const gchar *str,
-                       gssize       len) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar *g_utf8_strdown (const gchar *str,
-                       gssize       len) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar *g_utf8_casefold (const gchar *str,
-                        gssize       len) G_GNUC_MALLOC;
-
-/**
- * GNormalizeMode:
- * @G_NORMALIZE_DEFAULT: standardize differences that do not affect the
- *     text content, such as the above-mentioned accent representation
- * @G_NORMALIZE_NFD: another name for %G_NORMALIZE_DEFAULT
- * @G_NORMALIZE_DEFAULT_COMPOSE: like %G_NORMALIZE_DEFAULT, but with
- *     composed forms rather than a maximally decomposed form
- * @G_NORMALIZE_NFC: another name for %G_NORMALIZE_DEFAULT_COMPOSE
- * @G_NORMALIZE_ALL: beyond %G_NORMALIZE_DEFAULT also standardize the
- *     "compatibility" characters in Unicode, such as SUPERSCRIPT THREE
- *     to the standard forms (in this case DIGIT THREE). Formatting
- *     information may be lost but for most text operations such
- *     characters should be considered the same
- * @G_NORMALIZE_NFKD: another name for %G_NORMALIZE_ALL
- * @G_NORMALIZE_ALL_COMPOSE: like %G_NORMALIZE_ALL, but with composed
- *     forms rather than a maximally decomposed form
- * @G_NORMALIZE_NFKC: another name for %G_NORMALIZE_ALL_COMPOSE
- *
- * Defines how a Unicode string is transformed in a canonical
- * form, standardizing such issues as whether a character with
- * an accent is represented as a base character and combining
- * accent or as a single precomposed character. Unicode strings
- * should generally be normalized before comparing them.
- */
-typedef enum {
-  G_NORMALIZE_DEFAULT,
-  G_NORMALIZE_NFD = G_NORMALIZE_DEFAULT,
-  G_NORMALIZE_DEFAULT_COMPOSE,
-  G_NORMALIZE_NFC = G_NORMALIZE_DEFAULT_COMPOSE,
-  G_NORMALIZE_ALL,
-  G_NORMALIZE_NFKD = G_NORMALIZE_ALL,
-  G_NORMALIZE_ALL_COMPOSE,
-  G_NORMALIZE_NFKC = G_NORMALIZE_ALL_COMPOSE
-} GNormalizeMode;
-
-GLIB_AVAILABLE_IN_ALL
-gchar *g_utf8_normalize (const gchar   *str,
-                         gssize         len,
-                         GNormalizeMode mode) G_GNUC_MALLOC;
-
-GLIB_AVAILABLE_IN_ALL
-gint   g_utf8_collate     (const gchar *str1,
-                           const gchar *str2) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-gchar *g_utf8_collate_key (const gchar *str,
-                           gssize       len) G_GNUC_MALLOC;
-GLIB_AVAILABLE_IN_ALL
-gchar *g_utf8_collate_key_for_filename (const gchar *str,
-                                        gssize       len) G_GNUC_MALLOC;
-
-
-/* private */
-gchar *_g_utf8_make_valid (const gchar *name);
-
-G_END_DECLS
-
-#endif /* __G_UNICODE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gurifuncs.h b/linux-x86/include/glib-2.0/glib/gurifuncs.h
deleted file mode 100644
index 9f89770..0000000
--- a/linux-x86/include/glib-2.0/glib/gurifuncs.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_URI_FUNCS_H__
-#define __G_URI_FUNCS_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_URI_RESERVED_CHARS_GENERIC_DELIMITERS:
- * 
- * Generic delimiters characters as defined in RFC 3986. Includes ":/?#[]@".
- **/
-#define G_URI_RESERVED_CHARS_GENERIC_DELIMITERS ":/?#[]@"
-
-/**
- * G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS:
- * 
- * Subcomponent delimiter characters as defined in RFC 3986. Includes "!$&'()*+,;=".
- **/
-#define G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS "!$&'()*+,;="
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT:
- * 
- * Allowed characters in path elements. Includes "!$&'()*+,;=:@".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS ":@"
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_PATH:
- * 
- * Allowed characters in a path. Includes "!$&'()*+,;=:@/".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_PATH G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT "/"
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO:
- * 
- * Allowed characters in userinfo as defined in RFC 3986. Includes "!$&'()*+,;=:".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS ":"
-
-GLIB_AVAILABLE_IN_ALL
-char *   g_uri_unescape_string       (const char *escaped_string,
-				      const char *illegal_characters);
-GLIB_AVAILABLE_IN_ALL
-char *   g_uri_unescape_segment      (const char *escaped_string,
-				      const char *escaped_string_end,
-				      const char *illegal_characters);
-GLIB_AVAILABLE_IN_ALL
-char *   g_uri_parse_scheme          (const char *uri);
-GLIB_AVAILABLE_IN_ALL
-char *   g_uri_escape_string         (const char *unescaped,
-				      const char *reserved_chars_allowed,
-				      gboolean    allow_utf8);
-
-G_END_DECLS
-
-#endif /* __G_URI_FUNCS_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gutils.h b/linux-x86/include/glib-2.0/glib/gutils.h
deleted file mode 100644
index 472f3c2..0000000
--- a/linux-x86/include/glib-2.0/glib/gutils.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_UTILS_H__
-#define __G_UTILS_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-/* Define G_VA_COPY() to do the right thing for copying va_list variables.
- * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
- */
-#if !defined (G_VA_COPY)
-#  if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
-#    define G_VA_COPY(ap1, ap2)	  (*(ap1) = *(ap2))
-#  elif defined (G_VA_COPY_AS_ARRAY)
-#    define G_VA_COPY(ap1, ap2)	  g_memmove ((ap1), (ap2), sizeof (va_list))
-#  else /* va_list is a pointer */
-#    define G_VA_COPY(ap1, ap2)	  ((ap1) = (ap2))
-#  endif /* va_list is a pointer */
-#endif /* !G_VA_COPY */
-
-/* inlining hassle. for compilers that don't allow the 'inline' keyword,
- * mostly because of strict ANSI C compliance or dumbness, we try to fall
- * back to either '__inline__' or '__inline'.
- * G_CAN_INLINE is defined in glibconfig.h if the compiler seems to be 
- * actually *capable* to do function inlining, in which case inline 
- * function bodies do make sense. we also define G_INLINE_FUNC to properly 
- * export the function prototypes if no inlining can be performed.
- * inline function bodies have to be special cased with G_CAN_INLINE and a
- * .c file specific macro to allow one compiled instance with extern linkage
- * of the functions by defining G_IMPLEMENT_INLINES and the .c file macro.
- */
-#if defined (G_HAVE_INLINE) && defined (__GNUC__) && defined (__STRICT_ANSI__)
-#  undef inline
-#  define inline __inline__
-#elif !defined (G_HAVE_INLINE)
-#  undef inline
-#  if defined (G_HAVE___INLINE__)
-#    define inline __inline__
-#  elif defined (G_HAVE___INLINE)
-#    define inline __inline
-#  else /* !inline && !__inline__ && !__inline */
-#    define inline  /* don't inline, then */
-#  endif
-#endif
-#ifdef G_IMPLEMENT_INLINES
-#  define G_INLINE_FUNC _GLIB_EXTERN
-#  undef  G_CAN_INLINE
-#elif defined (__GNUC__) 
-#  define G_INLINE_FUNC static __inline __attribute__ ((unused))
-#elif defined (G_CAN_INLINE) 
-#  define G_INLINE_FUNC static inline
-#else /* can't inline */
-#  define G_INLINE_FUNC _GLIB_EXTERN
-#endif /* !G_INLINE_FUNC */
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_get_user_name        (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_get_real_name        (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_get_home_dir         (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_get_tmp_dir          (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_get_host_name	     (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_get_prgname          (void);
-GLIB_AVAILABLE_IN_ALL
-void                  g_set_prgname          (const gchar *prgname);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_get_application_name (void);
-GLIB_AVAILABLE_IN_ALL
-void                  g_set_application_name (const gchar *application_name);
-
-GLIB_AVAILABLE_IN_ALL
-void      g_reload_user_special_dirs_cache     (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_get_user_data_dir      (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_get_user_config_dir    (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_get_user_cache_dir     (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar * const * g_get_system_data_dirs   (void);
-
-#ifdef G_OS_WIN32
-/* This functions is not part of the public GLib API */
-GLIB_AVAILABLE_IN_ALL
-const gchar * const * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void));
-#endif
-
-#if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus)
-/* This function is not part of the public GLib API either. Just call
- * g_get_system_data_dirs() in your code, never mind that that is
- * actually a macro and you will in fact call this inline function.
- */
-static inline const gchar * const *
-_g_win32_get_system_data_dirs (void)
-{
-  return g_win32_get_system_data_dirs_for_module ((void (*)(void)) &_g_win32_get_system_data_dirs);
-}
-#define g_get_system_data_dirs _g_win32_get_system_data_dirs
-#endif
-
-GLIB_AVAILABLE_IN_ALL
-const gchar * const * g_get_system_config_dirs (void);
-
-GLIB_AVAILABLE_IN_ALL
-const gchar * g_get_user_runtime_dir (void);
-
-/**
- * GUserDirectory:
- * @G_USER_DIRECTORY_DESKTOP: the user's Desktop directory
- * @G_USER_DIRECTORY_DOCUMENTS: the user's Documents directory
- * @G_USER_DIRECTORY_DOWNLOAD: the user's Downloads directory
- * @G_USER_DIRECTORY_MUSIC: the user's Music directory
- * @G_USER_DIRECTORY_PICTURES: the user's Pictures directory
- * @G_USER_DIRECTORY_PUBLIC_SHARE: the user's shared directory
- * @G_USER_DIRECTORY_TEMPLATES: the user's Templates directory
- * @G_USER_DIRECTORY_VIDEOS: the user's Movies directory
- * @G_USER_N_DIRECTORIES: the number of enum values
- *
- * These are logical ids for special directories which are defined
- * depending on the platform used. You should use g_get_user_special_dir()
- * to retrieve the full path associated to the logical id.
- *
- * The #GUserDirectory enumeration can be extended at later date. Not
- * every platform has a directory for every logical id in this
- * enumeration.
- *
- * Since: 2.14
- */
-typedef enum {
-  G_USER_DIRECTORY_DESKTOP,
-  G_USER_DIRECTORY_DOCUMENTS,
-  G_USER_DIRECTORY_DOWNLOAD,
-  G_USER_DIRECTORY_MUSIC,
-  G_USER_DIRECTORY_PICTURES,
-  G_USER_DIRECTORY_PUBLIC_SHARE,
-  G_USER_DIRECTORY_TEMPLATES,
-  G_USER_DIRECTORY_VIDEOS,
-
-  G_USER_N_DIRECTORIES
-} GUserDirectory;
-
-GLIB_AVAILABLE_IN_ALL
-const gchar * g_get_user_special_dir (GUserDirectory directory);
-
-/**
- * GDebugKey:
- * @key: the string
- * @value: the flag
- *
- * Associates a string with a bit flag.
- * Used in g_parse_debug_string().
- */
-typedef struct _GDebugKey GDebugKey;
-struct _GDebugKey
-{
-  const gchar *key;
-  guint	       value;
-};
-
-/* Miscellaneous utility functions
- */
-GLIB_AVAILABLE_IN_ALL
-guint                 g_parse_debug_string (const gchar     *string,
-					    const GDebugKey *keys,
-					    guint            nkeys);
-
-GLIB_AVAILABLE_IN_ALL
-gint                  g_snprintf           (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    ...) G_GNUC_PRINTF (3, 4);
-GLIB_AVAILABLE_IN_ALL
-gint                  g_vsnprintf          (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    va_list      args)
-					    G_GNUC_PRINTF(3, 0);
-
-GLIB_AVAILABLE_IN_ALL
-void                  g_nullify_pointer    (gpointer    *nullify_location);
-
-typedef enum
-{
-  G_FORMAT_SIZE_DEFAULT     = 0,
-  G_FORMAT_SIZE_LONG_FORMAT = 1 << 0,
-  G_FORMAT_SIZE_IEC_UNITS   = 1 << 1
-} GFormatSizeFlags;
-
-GLIB_AVAILABLE_IN_2_30
-gchar *g_format_size_full   (guint64          size,
-                             GFormatSizeFlags flags);
-GLIB_AVAILABLE_IN_2_30
-gchar *g_format_size        (guint64          size);
-
-GLIB_DEPRECATED_FOR(g_format_size)
-gchar *g_format_size_for_display (goffset size);
-
-#ifndef G_DISABLE_DEPRECATED
-/**
- * GVoidFunc:
- *
- * Declares a type of function which takes no arguments
- * and has no return value. It is used to specify the type
- * function passed to g_atexit().
- */
-typedef void (*GVoidFunc) (void);
-#ifndef ATEXIT
-# define ATEXIT(proc) g_ATEXIT(proc)
-#else
-# define G_NATIVE_ATEXIT
-#endif /* ATEXIT */
-/* we use a GLib function as a replacement for ATEXIT, so
- * the programmer is not required to check the return value
- * (if there is any in the implementation) and doesn't encounter
- * missing include files.
- */
-GLIB_DEPRECATED
-void	g_atexit		(GVoidFunc    func);
-
-#ifdef G_OS_WIN32
-/* It's a bad idea to wrap atexit() on Windows. If the GLib DLL calls
- * atexit(), the function will be called when the GLib DLL is detached
- * from the program, which is not what the caller wants. The caller
- * wants the function to be called when it *itself* exits (or is
- * detached, in case the caller, too, is a DLL).
- */
-#if (defined(__MINGW_H) && !defined(_STDLIB_H_)) || (defined(_MSC_VER) && !defined(_INC_STDLIB))
-int atexit (void (*)(void));
-#endif
-#define g_atexit(func) atexit(func)
-#endif
-
-#endif  /* G_DISABLE_DEPRECATED */
-
-
-/* Look for an executable in PATH, following execvp() rules */
-GLIB_AVAILABLE_IN_ALL
-gchar*  g_find_program_in_path  (const gchar *program);
-
-/* Bit tests
- */
-G_INLINE_FUNC gint	g_bit_nth_lsf (gulong  mask,
-				       gint    nth_bit) G_GNUC_CONST;
-G_INLINE_FUNC gint	g_bit_nth_msf (gulong  mask,
-				       gint    nth_bit) G_GNUC_CONST;
-G_INLINE_FUNC guint	g_bit_storage (gulong  number) G_GNUC_CONST;
-
-/* inline function implementations
- */
-#if defined (G_CAN_INLINE) || defined (__G_UTILS_C__)
-G_INLINE_FUNC gint
-g_bit_nth_lsf (gulong mask,
-	       gint   nth_bit)
-{
-  if (G_UNLIKELY (nth_bit < -1))
-    nth_bit = -1;
-  while (nth_bit < ((GLIB_SIZEOF_LONG * 8) - 1))
-    {
-      nth_bit++;
-      if (mask & (1UL << nth_bit))
-	return nth_bit;
-    }
-  return -1;
-}
-G_INLINE_FUNC gint
-g_bit_nth_msf (gulong mask,
-	       gint   nth_bit)
-{
-  if (nth_bit < 0 || G_UNLIKELY (nth_bit > GLIB_SIZEOF_LONG * 8))
-    nth_bit = GLIB_SIZEOF_LONG * 8;
-  while (nth_bit > 0)
-    {
-      nth_bit--;
-      if (mask & (1UL << nth_bit))
-	return nth_bit;
-    }
-  return -1;
-}
-G_INLINE_FUNC guint
-g_bit_storage (gulong number)
-{
-#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
-  return G_LIKELY (number) ?
-	   ((GLIB_SIZEOF_LONG * 8U - 1) ^ (guint) __builtin_clzl(number)) + 1 : 1;
-#else
-  register guint n_bits = 0;
-  
-  do
-    {
-      n_bits++;
-      number >>= 1;
-    }
-  while (number);
-  return n_bits;
-#endif
-}
-#endif  /* G_CAN_INLINE || __G_UTILS_C__ */
-
-#ifndef G_DISABLE_DEPRECATED
-
-/*
- * This macro is deprecated. This DllMain() is too complex. It is
- * recommended to write an explicit minimal DLlMain() that just saves
- * the handle to the DLL and then use that handle instead, for
- * instance passing it to
- * g_win32_get_package_installation_directory_of_module().
- *
- * On Windows, this macro defines a DllMain function that stores the
- * actual DLL name that the code being compiled will be included in.
- * STATIC should be empty or 'static'. DLL_NAME is the name of the
- * (pointer to the) char array where the DLL name will be stored. If
- * this is used, you must also include <windows.h>. If you need a more complex
- * DLL entry point function, you cannot use this.
- *
- * On non-Windows platforms, expands to nothing.
- */
-
-#ifndef G_PLATFORM_WIN32
-# define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
-#else
-# define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)			\
-static char *dll_name;							\
-									\
-BOOL WINAPI								\
-DllMain (HINSTANCE hinstDLL,						\
-	 DWORD     fdwReason,						\
-	 LPVOID    lpvReserved)						\
-{									\
-  wchar_t wcbfr[1000];							\
-  char *tem;								\
-  switch (fdwReason)							\
-    {									\
-    case DLL_PROCESS_ATTACH:						\
-      GetModuleFileNameW ((HMODULE) hinstDLL, wcbfr, G_N_ELEMENTS (wcbfr)); \
-      tem = g_utf16_to_utf8 (wcbfr, -1, NULL, NULL, NULL);		\
-      dll_name = g_path_get_basename (tem);				\
-      g_free (tem);							\
-      break;								\
-    }									\
-									\
-  return TRUE;								\
-}
-
-#endif	/* !G_DISABLE_DEPRECATED */
-
-#endif /* G_PLATFORM_WIN32 */
-
-G_END_DECLS
-
-#endif /* __G_UTILS_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gvariant.h b/linux-x86/include/glib-2.0/glib/gvariant.h
deleted file mode 100644
index dbace86..0000000
--- a/linux-x86/include/glib-2.0/glib/gvariant.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Copyright © 2007, 2008 Ryan Lortie
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_VARIANT_H__
-#define __G_VARIANT_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gvarianttype.h>
-#include <glib/gstring.h>
-#include <glib/gbytes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GVariant        GVariant;
-
-typedef enum
-{
-  G_VARIANT_CLASS_BOOLEAN       = 'b',
-  G_VARIANT_CLASS_BYTE          = 'y',
-  G_VARIANT_CLASS_INT16         = 'n',
-  G_VARIANT_CLASS_UINT16        = 'q',
-  G_VARIANT_CLASS_INT32         = 'i',
-  G_VARIANT_CLASS_UINT32        = 'u',
-  G_VARIANT_CLASS_INT64         = 'x',
-  G_VARIANT_CLASS_UINT64        = 't',
-  G_VARIANT_CLASS_HANDLE        = 'h',
-  G_VARIANT_CLASS_DOUBLE        = 'd',
-  G_VARIANT_CLASS_STRING        = 's',
-  G_VARIANT_CLASS_OBJECT_PATH   = 'o',
-  G_VARIANT_CLASS_SIGNATURE     = 'g',
-  G_VARIANT_CLASS_VARIANT       = 'v',
-  G_VARIANT_CLASS_MAYBE         = 'm',
-  G_VARIANT_CLASS_ARRAY         = 'a',
-  G_VARIANT_CLASS_TUPLE         = '(',
-  G_VARIANT_CLASS_DICT_ENTRY    = '{'
-} GVariantClass;
-
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_unref                         (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_ref                           (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_ref_sink                      (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_is_floating                   (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_take_ref                      (GVariant             *value);
-
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *            g_variant_get_type                      (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-const gchar *                   g_variant_get_type_string               (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_is_of_type                    (GVariant             *value,
-                                                                         const GVariantType   *type);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_is_container                  (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-GVariantClass                   g_variant_classify                      (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_boolean                   (gboolean              value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_byte                      (guchar                value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_int16                     (gint16                value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_uint16                    (guint16               value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_int32                     (gint32                value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_uint32                    (guint32               value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_int64                     (gint64                value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_uint64                    (guint64               value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_handle                    (gint32                value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_double                    (gdouble               value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_string                    (const gchar          *string);
-GLIB_AVAILABLE_IN_2_38
-GVariant *                      g_variant_new_take_string               (gchar                *string);
-GLIB_AVAILABLE_IN_2_38
-GVariant *                      g_variant_new_printf                    (const gchar          *format_string,
-                                                                         ...) G_GNUC_PRINTF (1, 2);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_object_path               (const gchar          *object_path);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_is_object_path                (const gchar          *string);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_signature                 (const gchar          *signature);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_is_signature                  (const gchar          *string);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_variant                   (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_strv                      (const gchar * const  *strv,
-                                                                         gssize                length);
-GLIB_AVAILABLE_IN_2_30
-GVariant *                      g_variant_new_objv                      (const gchar * const  *strv,
-                                                                         gssize                length);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_bytestring                (const gchar          *string);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_bytestring_array          (const gchar * const  *strv,
-                                                                         gssize                length);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_fixed_array               (const GVariantType   *element_type,
-                                                                         gconstpointer         elements,
-                                                                         gsize                 n_elements,
-                                                                         gsize                 element_size);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_get_boolean                   (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-guchar                          g_variant_get_byte                      (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gint16                          g_variant_get_int16                     (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-guint16                         g_variant_get_uint16                    (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gint32                          g_variant_get_int32                     (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-guint32                         g_variant_get_uint32                    (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gint64                          g_variant_get_int64                     (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-guint64                         g_variant_get_uint64                    (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gint32                          g_variant_get_handle                    (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gdouble                         g_variant_get_double                    (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_get_variant                   (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-const gchar *                   g_variant_get_string                    (GVariant             *value,
-                                                                         gsize                *length);
-GLIB_AVAILABLE_IN_ALL
-gchar *                         g_variant_dup_string                    (GVariant             *value,
-                                                                         gsize                *length);
-GLIB_AVAILABLE_IN_ALL
-const gchar **                  g_variant_get_strv                      (GVariant             *value,
-                                                                         gsize                *length);
-GLIB_AVAILABLE_IN_ALL
-gchar **                        g_variant_dup_strv                      (GVariant             *value,
-                                                                         gsize                *length);
-GLIB_AVAILABLE_IN_2_30
-const gchar **                  g_variant_get_objv                      (GVariant             *value,
-                                                                         gsize                *length);
-GLIB_AVAILABLE_IN_ALL
-gchar **                        g_variant_dup_objv                      (GVariant             *value,
-                                                                         gsize                *length);
-GLIB_AVAILABLE_IN_ALL
-const gchar *                   g_variant_get_bytestring                (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gchar *                         g_variant_dup_bytestring                (GVariant             *value,
-                                                                         gsize                *length);
-GLIB_AVAILABLE_IN_ALL
-const gchar **                  g_variant_get_bytestring_array          (GVariant             *value,
-                                                                         gsize                *length);
-GLIB_AVAILABLE_IN_ALL
-gchar **                        g_variant_dup_bytestring_array          (GVariant             *value,
-                                                                         gsize                *length);
-
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_maybe                     (const GVariantType   *child_type,
-                                                                         GVariant             *child);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_array                     (const GVariantType   *child_type,
-                                                                         GVariant * const     *children,
-                                                                         gsize                 n_children);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_tuple                     (GVariant * const     *children,
-                                                                         gsize                 n_children);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_dict_entry                (GVariant             *key,
-                                                                         GVariant             *value);
-
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_get_maybe                     (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gsize                           g_variant_n_children                    (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_get_child                     (GVariant             *value,
-                                                                         gsize                 index_,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_get_child_value               (GVariant             *value,
-                                                                         gsize                 index_);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_lookup                        (GVariant             *dictionary,
-                                                                         const gchar          *key,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_lookup_value                  (GVariant             *dictionary,
-                                                                         const gchar          *key,
-                                                                         const GVariantType   *expected_type);
-GLIB_AVAILABLE_IN_ALL
-gconstpointer                   g_variant_get_fixed_array               (GVariant             *value,
-                                                                         gsize                *n_elements,
-                                                                         gsize                 element_size);
-
-GLIB_AVAILABLE_IN_ALL
-gsize                           g_variant_get_size                      (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gconstpointer                   g_variant_get_data                      (GVariant             *value);
-GLIB_AVAILABLE_IN_2_36
-GBytes *                        g_variant_get_data_as_bytes             (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_store                         (GVariant             *value,
-                                                                         gpointer              data);
-
-GLIB_AVAILABLE_IN_ALL
-gchar *                         g_variant_print                         (GVariant             *value,
-                                                                         gboolean              type_annotate);
-GLIB_AVAILABLE_IN_ALL
-GString *                       g_variant_print_string                  (GVariant             *value,
-                                                                         GString              *string,
-                                                                         gboolean              type_annotate);
-
-GLIB_AVAILABLE_IN_ALL
-guint                           g_variant_hash                          (gconstpointer         value);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_equal                         (gconstpointer         one,
-                                                                         gconstpointer         two);
-
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_get_normal_form               (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_is_normal_form                (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_byteswap                      (GVariant             *value);
-
-GLIB_AVAILABLE_IN_2_36
-GVariant *                      g_variant_new_from_bytes                (const GVariantType   *type,
-                                                                         GBytes               *bytes,
-                                                                         gboolean              trusted);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_from_data                 (const GVariantType   *type,
-                                                                         gconstpointer         data,
-                                                                         gsize                 size,
-                                                                         gboolean              trusted,
-                                                                         GDestroyNotify        notify,
-                                                                         gpointer              user_data);
-
-typedef struct _GVariantIter GVariantIter;
-struct _GVariantIter {
-  /*< private >*/
-  gsize x[16];
-};
-
-GLIB_AVAILABLE_IN_ALL
-GVariantIter *                  g_variant_iter_new                      (GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-gsize                           g_variant_iter_init                     (GVariantIter         *iter,
-                                                                         GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-GVariantIter *                  g_variant_iter_copy                     (GVariantIter         *iter);
-GLIB_AVAILABLE_IN_ALL
-gsize                           g_variant_iter_n_children               (GVariantIter         *iter);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_iter_free                     (GVariantIter         *iter);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_iter_next_value               (GVariantIter         *iter);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_iter_next                     (GVariantIter         *iter,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_iter_loop                     (GVariantIter         *iter,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-
-
-typedef struct _GVariantBuilder GVariantBuilder;
-struct _GVariantBuilder {
-  /*< private >*/
-  gsize x[16];
-};
-
-typedef enum
-{
-  G_VARIANT_PARSE_ERROR_FAILED,
-  G_VARIANT_PARSE_ERROR_BASIC_TYPE_EXPECTED,
-  G_VARIANT_PARSE_ERROR_CANNOT_INFER_TYPE,
-  G_VARIANT_PARSE_ERROR_DEFINITE_TYPE_EXPECTED,
-  G_VARIANT_PARSE_ERROR_INPUT_NOT_AT_END,
-  G_VARIANT_PARSE_ERROR_INVALID_CHARACTER,
-  G_VARIANT_PARSE_ERROR_INVALID_FORMAT_STRING,
-  G_VARIANT_PARSE_ERROR_INVALID_OBJECT_PATH,
-  G_VARIANT_PARSE_ERROR_INVALID_SIGNATURE,
-  G_VARIANT_PARSE_ERROR_INVALID_TYPE_STRING,
-  G_VARIANT_PARSE_ERROR_NO_COMMON_TYPE,
-  G_VARIANT_PARSE_ERROR_NUMBER_OUT_OF_RANGE,
-  G_VARIANT_PARSE_ERROR_NUMBER_TOO_BIG,
-  G_VARIANT_PARSE_ERROR_TYPE_ERROR,
-  G_VARIANT_PARSE_ERROR_UNEXPECTED_TOKEN,
-  G_VARIANT_PARSE_ERROR_UNKNOWN_KEYWORD,
-  G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT,
-  G_VARIANT_PARSE_ERROR_VALUE_EXPECTED
-} GVariantParseError;
-#define G_VARIANT_PARSE_ERROR (g_variant_parser_get_error_quark ())
-
-GLIB_AVAILABLE_IN_ALL
-GQuark                          g_variant_parser_get_error_quark        (void);
-
-GLIB_AVAILABLE_IN_ALL
-GVariantBuilder *               g_variant_builder_new                   (const GVariantType   *type);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_builder_unref                 (GVariantBuilder      *builder);
-GLIB_AVAILABLE_IN_ALL
-GVariantBuilder *               g_variant_builder_ref                   (GVariantBuilder      *builder);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_builder_init                  (GVariantBuilder      *builder,
-                                                                         const GVariantType   *type);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_builder_end                   (GVariantBuilder      *builder);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_builder_clear                 (GVariantBuilder      *builder);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_builder_open                  (GVariantBuilder      *builder,
-                                                                         const GVariantType   *type);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_builder_close                 (GVariantBuilder      *builder);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_builder_add_value             (GVariantBuilder      *builder,
-                                                                         GVariant             *value);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_builder_add                   (GVariantBuilder      *builder,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_builder_add_parsed            (GVariantBuilder      *builder,
-                                                                         const gchar          *format,
-                                                                         ...);
-
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new                           (const gchar          *format_string,
-                                                                         ...);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_get                           (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_va                        (const gchar          *format_string,
-                                                                         const gchar         **endptr,
-                                                                         va_list              *app);
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_get_va                        (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         const gchar         **endptr,
-                                                                         va_list              *app);
-GLIB_AVAILABLE_IN_2_34
-gboolean                        g_variant_check_format_string           (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         gboolean              copy_only);
-
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_parse                         (const GVariantType   *type,
-                                                                         const gchar          *text,
-                                                                         const gchar          *limit,
-                                                                         const gchar         **endptr,
-                                                                         GError              **error);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_parsed                    (const gchar          *format,
-                                                                         ...);
-GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_parsed_va                 (const gchar          *format,
-                                                                         va_list              *app);
-
-GLIB_AVAILABLE_IN_ALL
-gint                            g_variant_compare                       (gconstpointer one,
-                                                                         gconstpointer two);
-G_END_DECLS
-
-#endif /* __G_VARIANT_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gvarianttype.h b/linux-x86/include/glib-2.0/glib/gvarianttype.h
deleted file mode 100644
index 81e324f..0000000
--- a/linux-x86/include/glib-2.0/glib/gvarianttype.h
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright © 2007, 2008 Ryan Lortie
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_VARIANT_TYPE_H__
-#define __G_VARIANT_TYPE_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gmessages.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GVariantType:
- *
- * A type in the GVariant type system.
- *
- * Two types may not be compared by value; use g_variant_type_equal() or
- * g_variant_type_is_subtype_of().  May be copied using
- * g_variant_type_copy() and freed using g_variant_type_free().
- **/
-typedef struct _GVariantType GVariantType;
-
-/**
- * G_VARIANT_TYPE_BOOLEAN:
- *
- * The type of a value that can be either %TRUE or %FALSE.
- **/
-#define G_VARIANT_TYPE_BOOLEAN              ((const GVariantType *) "b")
-
-/**
- * G_VARIANT_TYPE_BYTE:
- *
- * The type of an integer value that can range from 0 to 255.
- **/
-#define G_VARIANT_TYPE_BYTE                 ((const GVariantType *) "y")
-
-/**
- * G_VARIANT_TYPE_INT16:
- *
- * The type of an integer value that can range from -32768 to 32767.
- **/
-#define G_VARIANT_TYPE_INT16                ((const GVariantType *) "n")
-
-/**
- * G_VARIANT_TYPE_UINT16:
- *
- * The type of an integer value that can range from 0 to 65535.
- * There were about this many people living in Toronto in the 1870s.
- **/
-#define G_VARIANT_TYPE_UINT16               ((const GVariantType *) "q")
-
-/**
- * G_VARIANT_TYPE_INT32:
- *
- * The type of an integer value that can range from -2147483648 to
- * 2147483647.
- **/
-#define G_VARIANT_TYPE_INT32                ((const GVariantType *) "i")
-
-/**
- * G_VARIANT_TYPE_UINT32:
- *
- * The type of an integer value that can range from 0 to 4294967295.
- * That's one number for everyone who was around in the late 1970s.
- **/
-#define G_VARIANT_TYPE_UINT32               ((const GVariantType *) "u")
-
-/**
- * G_VARIANT_TYPE_INT64:
- *
- * The type of an integer value that can range from
- * -9223372036854775808 to 9223372036854775807.
- **/
-#define G_VARIANT_TYPE_INT64                ((const GVariantType *) "x")
-
-/**
- * G_VARIANT_TYPE_UINT64:
- *
- * The type of an integer value that can range from 0 to
- * 18446744073709551616.  That's a really big number, but a Rubik's
- * cube can have a bit more than twice as many possible positions.
- **/
-#define G_VARIANT_TYPE_UINT64               ((const GVariantType *) "t")
-
-/**
- * G_VARIANT_TYPE_DOUBLE:
- *
- * The type of a double precision IEEE754 floating point number.
- * These guys go up to about 1.80e308 (plus and minus) but miss out on
- * some numbers in between.  In any case, that's far greater than the
- * estimated number of fundamental particles in the observable
- * universe.
- **/
-#define G_VARIANT_TYPE_DOUBLE               ((const GVariantType *) "d")
-
-/**
- * G_VARIANT_TYPE_STRING:
- *
- * The type of a string.  "" is a string.  %NULL is not a string.
- **/
-#define G_VARIANT_TYPE_STRING               ((const GVariantType *) "s")
-
-/**
- * G_VARIANT_TYPE_OBJECT_PATH:
- *
- * The type of a D-Bus object reference.  These are strings of a
- * specific format used to identify objects at a given destination on
- * the bus.
- *
- * If you are not interacting with D-Bus, then there is no reason to make
- * use of this type.  If you are, then the D-Bus specification contains a
- * precise description of valid object paths.
- **/
-#define G_VARIANT_TYPE_OBJECT_PATH          ((const GVariantType *) "o")
-
-/**
- * G_VARIANT_TYPE_SIGNATURE:
- *
- * The type of a D-Bus type signature.  These are strings of a specific
- * format used as type signatures for D-Bus methods and messages.
- *
- * If you are not interacting with D-Bus, then there is no reason to make
- * use of this type.  If you are, then the D-Bus specification contains a
- * precise description of valid signature strings.
- **/
-#define G_VARIANT_TYPE_SIGNATURE            ((const GVariantType *) "g")
-
-/**
- * G_VARIANT_TYPE_VARIANT:
- *
- * The type of a box that contains any other value (including another
- * variant).
- **/
-#define G_VARIANT_TYPE_VARIANT              ((const GVariantType *) "v")
-
-/**
- * G_VARIANT_TYPE_HANDLE:
- *
- * The type of a 32bit signed integer value, that by convention, is used
- * as an index into an array of file descriptors that are sent alongside
- * a D-Bus message.
- *
- * If you are not interacting with D-Bus, then there is no reason to make
- * use of this type.
- **/
-#define G_VARIANT_TYPE_HANDLE               ((const GVariantType *) "h")
-
-/**
- * G_VARIANT_TYPE_UNIT:
- *
- * The empty tuple type.  Has only one instance.  Known also as "triv"
- * or "void".
- **/
-#define G_VARIANT_TYPE_UNIT                 ((const GVariantType *) "()")
-
-/**
- * G_VARIANT_TYPE_ANY:
- *
- * An indefinite type that is a supertype of every type (including
- * itself).
- **/
-#define G_VARIANT_TYPE_ANY                  ((const GVariantType *) "*")
-
-/**
- * G_VARIANT_TYPE_BASIC:
- *
- * An indefinite type that is a supertype of every basic (ie:
- * non-container) type.
- **/
-#define G_VARIANT_TYPE_BASIC                ((const GVariantType *) "?")
-
-/**
- * G_VARIANT_TYPE_MAYBE:
- *
- * An indefinite type that is a supertype of every maybe type.
- **/
-#define G_VARIANT_TYPE_MAYBE                ((const GVariantType *) "m*")
-
-/**
- * G_VARIANT_TYPE_ARRAY:
- *
- * An indefinite type that is a supertype of every array type.
- **/
-#define G_VARIANT_TYPE_ARRAY                ((const GVariantType *) "a*")
-
-/**
- * G_VARIANT_TYPE_TUPLE:
- *
- * An indefinite type that is a supertype of every tuple type,
- * regardless of the number of items in the tuple.
- **/
-#define G_VARIANT_TYPE_TUPLE                ((const GVariantType *) "r")
-
-/**
- * G_VARIANT_TYPE_DICT_ENTRY:
- *
- * An indefinite type that is a supertype of every dictionary entry
- * type.
- **/
-#define G_VARIANT_TYPE_DICT_ENTRY           ((const GVariantType *) "{?*}")
-
-/**
- * G_VARIANT_TYPE_DICTIONARY:
- *
- * An indefinite type that is a supertype of every dictionary type --
- * that is, any array type that has an element type equal to any
- * dictionary entry type.
- **/
-#define G_VARIANT_TYPE_DICTIONARY           ((const GVariantType *) "a{?*}")
-
-/**
- * G_VARIANT_TYPE_STRING_ARRAY:
- *
- * The type of an array of strings.
- **/
-#define G_VARIANT_TYPE_STRING_ARRAY         ((const GVariantType *) "as")
-
-/**
- * G_VARIANT_TYPE_OBJECT_PATH_ARRAY:
- *
- * The type of an array of object paths.
- **/
-#define G_VARIANT_TYPE_OBJECT_PATH_ARRAY    ((const GVariantType *) "ao")
-
-/**
- * G_VARIANT_TYPE_BYTESTRING:
- *
- * The type of an array of bytes.  This type is commonly used to pass
- * around strings that may not be valid utf8.  In that case, the
- * convention is that the nul terminator character should be included as
- * the last character in the array.
- **/
-#define G_VARIANT_TYPE_BYTESTRING           ((const GVariantType *) "ay")
-
-/**
- * G_VARIANT_TYPE_BYTESTRING_ARRAY:
- *
- * The type of an array of byte strings (an array of arrays of bytes).
- **/
-#define G_VARIANT_TYPE_BYTESTRING_ARRAY     ((const GVariantType *) "aay")
-
-/**
- * G_VARIANT_TYPE_VARDICT:
- *
- * The type of a dictionary mapping strings to variants (the ubiquitous
- * "a{sv}" type).
- *
- * Since: 2.30
- **/
-#define G_VARIANT_TYPE_VARDICT              ((const GVariantType *) "a{sv}")
-
-
-/**
- * G_VARIANT_TYPE:
- * @type_string: a well-formed #GVariantType type string
- *
- * Converts a string to a const #GVariantType.  Depending on the
- * current debugging level, this function may perform a runtime check
- * to ensure that @string is a valid GVariant type string.
- *
- * It is always a programmer error to use this macro with an invalid
- * type string. If in doubt, use g_variant_type_string_is_valid() to
- * check if the string is valid.
- *
- * Since 2.24
- **/
-#ifndef G_DISABLE_CHECKS
-# define G_VARIANT_TYPE(type_string)            (g_variant_type_checked_ ((type_string)))
-#else
-# define G_VARIANT_TYPE(type_string)            ((const GVariantType *) (type_string))
-#endif
-
-/* type string checking */
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_string_is_valid          (const gchar         *type_string);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_string_scan              (const gchar         *string,
-                                                                         const gchar         *limit,
-                                                                         const gchar        **endptr);
-
-/* create/destroy */
-GLIB_AVAILABLE_IN_ALL
-void                            g_variant_type_free                     (GVariantType        *type);
-GLIB_AVAILABLE_IN_ALL
-GVariantType *                  g_variant_type_copy                     (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-GVariantType *                  g_variant_type_new                      (const gchar         *type_string);
-
-/* getters */
-GLIB_AVAILABLE_IN_ALL
-gsize                           g_variant_type_get_string_length        (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-const gchar *                   g_variant_type_peek_string              (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-gchar *                         g_variant_type_dup_string               (const GVariantType  *type);
-
-/* classification */
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_is_definite              (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_is_container             (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_is_basic                 (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_is_maybe                 (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_is_array                 (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_is_tuple                 (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_is_dict_entry            (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_is_variant               (const GVariantType  *type);
-
-/* for hash tables */
-GLIB_AVAILABLE_IN_ALL
-guint                           g_variant_type_hash                     (gconstpointer        type);
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_equal                    (gconstpointer        type1,
-                                                                         gconstpointer        type2);
-
-/* subtypes */
-GLIB_AVAILABLE_IN_ALL
-gboolean                        g_variant_type_is_subtype_of            (const GVariantType  *type,
-                                                                         const GVariantType  *supertype);
-
-/* type iterator interface */
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *            g_variant_type_element                  (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *            g_variant_type_first                    (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *            g_variant_type_next                     (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-gsize                           g_variant_type_n_items                  (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *            g_variant_type_key                      (const GVariantType  *type);
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *            g_variant_type_value                    (const GVariantType  *type);
-
-/* constructors */
-GLIB_AVAILABLE_IN_ALL
-GVariantType *                  g_variant_type_new_array                (const GVariantType  *element);
-GLIB_AVAILABLE_IN_ALL
-GVariantType *                  g_variant_type_new_maybe                (const GVariantType  *element);
-GLIB_AVAILABLE_IN_ALL
-GVariantType *                  g_variant_type_new_tuple                (const GVariantType * const *items,
-                                                                         gint                 length);
-GLIB_AVAILABLE_IN_ALL
-GVariantType *                  g_variant_type_new_dict_entry           (const GVariantType  *key,
-                                                                         const GVariantType  *value);
-
-/*< private >*/
-GLIB_AVAILABLE_IN_ALL
-const GVariantType *            g_variant_type_checked_                 (const gchar *);
-
-G_END_DECLS
-
-#endif /* __G_VARIANT_TYPE_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gversion.h b/linux-x86/include/glib-2.0/glib/gversion.h
deleted file mode 100644
index 7eb414d..0000000
--- a/linux-x86/include/glib-2.0/glib/gversion.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_VERSION_H__
-#define __G_VERSION_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_VAR const guint glib_major_version;
-GLIB_VAR const guint glib_minor_version;
-GLIB_VAR const guint glib_micro_version;
-GLIB_VAR const guint glib_interface_age;
-GLIB_VAR const guint glib_binary_age;
-
-GLIB_AVAILABLE_IN_ALL
-const gchar * glib_check_version (guint required_major,
-                                  guint required_minor,
-                                  guint required_micro);
-
-#define GLIB_CHECK_VERSION(major,minor,micro)    \
-    (GLIB_MAJOR_VERSION > (major) || \
-     (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION > (minor)) || \
-     (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION == (minor) && \
-      GLIB_MICRO_VERSION >= (micro)))
-
-G_END_DECLS
-
-#endif /*  __G_VERSION_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gversionmacros.h b/linux-x86/include/glib-2.0/glib/gversionmacros.h
deleted file mode 100644
index b591534..0000000
--- a/linux-x86/include/glib-2.0/glib/gversionmacros.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_VERSION_MACROS_H__
-#define __G_VERSION_MACROS_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-/* Version boundaries checks */
-
-#define G_ENCODE_VERSION(major,minor)   ((major) << 16 | (minor) << 8)
-
-/* XXX: Every new stable minor release bump should add a macro here */
-
-/**
- * GLIB_VERSION_2_26:
- *
- * A macro that evaluates to the 2.26 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_26       (G_ENCODE_VERSION (2, 26))
-
-/**
- * GLIB_VERSION_2_28:
- *
- * A macro that evaluates to the 2.28 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_28       (G_ENCODE_VERSION (2, 28))
-
-/**
- * GLIB_VERSION_2_30:
- *
- * A macro that evaluates to the 2.30 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_30       (G_ENCODE_VERSION (2, 30))
-
-/**
- * GLIB_VERSION_2_32:
- *
- * A macro that evaluates to the 2.32 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_32       (G_ENCODE_VERSION (2, 32))
-
-/**
- * GLIB_VERSION_2_34:
- *
- * A macro that evaluates to the 2.34 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.34
- */
-#define GLIB_VERSION_2_34       (G_ENCODE_VERSION (2, 34))
-
-/**
- * GLIB_VERSION_2_36:
- *
- * A macro that evaluates to the 2.36 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.36
- */
-#define GLIB_VERSION_2_36       (G_ENCODE_VERSION (2, 36))
-
-/**
- * GLIB_VERSION_2_38:
- *
- * A macro that evaluates to the 2.38 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.38
- */
-#define GLIB_VERSION_2_38       (G_ENCODE_VERSION (2, 38))
-
-/* evaluates to the current stable version; for development cycles,
- * this means the next stable target
- */
-#if (GLIB_MINOR_VERSION % 2)
-#define GLIB_VERSION_CUR_STABLE         (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION + 1))
-#else
-#define GLIB_VERSION_CUR_STABLE         (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION))
-#endif
-
-/* evaluates to the previous stable version */
-#if (GLIB_MINOR_VERSION % 2)
-#define GLIB_VERSION_PREV_STABLE        (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 1))
-#else
-#define GLIB_VERSION_PREV_STABLE        (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 2))
-#endif
-
-/**
- * GLIB_VERSION_MIN_REQUIRED:
- *
- * A macro that should be defined by the user prior to including
- * the glib.h header.
- * The definition should be one of the predefined GLib version
- * macros: %GLIB_VERSION_2_26, %GLIB_VERSION_2_28,...
- *
- * This macro defines the earliest version of GLib that the package is
- * required to be able to compile against.
- *
- * If the compiler is configured to warn about the use of deprecated
- * functions, then using functions that were deprecated in version
- * %GLIB_VERSION_MIN_REQUIRED or earlier will cause warnings (but
- * using functions deprecated in later releases will not).
- *
- * Since: 2.32
- */
-/* If the package sets GLIB_VERSION_MIN_REQUIRED to some future
- * GLIB_VERSION_X_Y value that we don't know about, it will compare as
- * 0 in preprocessor tests.
- */
-#ifndef GLIB_VERSION_MIN_REQUIRED
-# define GLIB_VERSION_MIN_REQUIRED      (GLIB_VERSION_CUR_STABLE)
-#elif GLIB_VERSION_MIN_REQUIRED == 0
-# undef  GLIB_VERSION_MIN_REQUIRED
-# define GLIB_VERSION_MIN_REQUIRED      (GLIB_VERSION_CUR_STABLE + 2)
-#endif
-
-/**
- * GLIB_VERSION_MAX_ALLOWED:
- *
- * A macro that should be defined by the user prior to including
- * the glib.h header.
- * The definition should be one of the predefined GLib version
- * macros: %GLIB_VERSION_2_26, %GLIB_VERSION_2_28,...
- *
- * This macro defines the latest version of the GLib API that the
- * package is allowed to make use of.
- *
- * If the compiler is configured to warn about the use of deprecated
- * functions, then using functions added after version
- * %GLIB_VERSION_MAX_ALLOWED will cause warnings.
- *
- * Unless you are using GLIB_CHECK_VERSION() or the like to compile
- * different code depending on the GLib version, then this should be
- * set to the same value as %GLIB_VERSION_MIN_REQUIRED.
- *
- * Since: 2.32
- */
-#if !defined (GLIB_VERSION_MAX_ALLOWED) || (GLIB_VERSION_MAX_ALLOWED == 0)
-# undef GLIB_VERSION_MAX_ALLOWED
-# define GLIB_VERSION_MAX_ALLOWED      (GLIB_VERSION_CUR_STABLE)
-#endif
-
-/* sanity checks */
-#if GLIB_VERSION_MIN_REQUIRED > GLIB_VERSION_CUR_STABLE
-#error "GLIB_VERSION_MIN_REQUIRED must be <= GLIB_VERSION_CUR_STABLE"
-#endif
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_MIN_REQUIRED
-#error "GLIB_VERSION_MAX_ALLOWED must be >= GLIB_VERSION_MIN_REQUIRED"
-#endif
-#if GLIB_VERSION_MIN_REQUIRED < GLIB_VERSION_2_26
-#error "GLIB_VERSION_MIN_REQUIRED must be >= GLIB_VERSION_2_26"
-#endif
-
-/* These macros are used to mark deprecated functions in GLib headers,
- * and thus have to be exposed in installed headers. But please
- * do *not* use them in other projects. Instead, use G_DEPRECATED
- * or define your own wrappers around it.
- */
-#define GLIB_AVAILABLE_IN_ALL                   _GLIB_EXTERN
-
-/* XXX: Every new stable minor release should add a set of macros here */
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_26
-# define GLIB_DEPRECATED_IN_2_26                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_26_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_26                _GLIB_EXTERN
-# define GLIB_DEPRECATED_IN_2_26_FOR(f)         _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_26
-# define GLIB_AVAILABLE_IN_2_26                 GLIB_UNAVAILABLE(2, 26)
-#else
-# define GLIB_AVAILABLE_IN_2_26                 _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_28
-# define GLIB_DEPRECATED_IN_2_28                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_28_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_28                _GLIB_EXTERN
-# define GLIB_DEPRECATED_IN_2_28_FOR(f)         _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_28
-# define GLIB_AVAILABLE_IN_2_28                 GLIB_UNAVAILABLE(2, 28)
-#else
-# define GLIB_AVAILABLE_IN_2_28                 _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_30
-# define GLIB_DEPRECATED_IN_2_30                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_30_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_30                _GLIB_EXTERN
-# define GLIB_DEPRECATED_IN_2_30_FOR(f)         _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_30
-# define GLIB_AVAILABLE_IN_2_30                 GLIB_UNAVAILABLE(2, 30)
-#else
-# define GLIB_AVAILABLE_IN_2_30                 _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_32
-# define GLIB_DEPRECATED_IN_2_32                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_32_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_32                _GLIB_EXTERN
-# define GLIB_DEPRECATED_IN_2_32_FOR(f)         _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_32
-# define GLIB_AVAILABLE_IN_2_32                 GLIB_UNAVAILABLE(2, 32)
-#else
-# define GLIB_AVAILABLE_IN_2_32                 _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_34
-# define GLIB_DEPRECATED_IN_2_34                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_34_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_34                _GLIB_EXTERN
-# define GLIB_DEPRECATED_IN_2_34_FOR(f)         _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_34
-# define GLIB_AVAILABLE_IN_2_34                 GLIB_UNAVAILABLE(2, 34)
-#else
-# define GLIB_AVAILABLE_IN_2_34                 _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_36
-# define GLIB_DEPRECATED_IN_2_36                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_36_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_36                _GLIB_EXTERN
-# define GLIB_DEPRECATED_IN_2_36_FOR(f)         _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_36
-# define GLIB_AVAILABLE_IN_2_36                 GLIB_UNAVAILABLE(2, 36)
-#else
-# define GLIB_AVAILABLE_IN_2_36                 _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_38
-# define GLIB_DEPRECATED_IN_2_38                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_38_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_38                _GLIB_EXTERN
-# define GLIB_DEPRECATED_IN_2_38_FOR(f)         _GLIB_EXTERN
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-# define GLIB_AVAILABLE_IN_2_38                 GLIB_UNAVAILABLE(2, 38)
-#else
-# define GLIB_AVAILABLE_IN_2_38                 _GLIB_EXTERN
-#endif
-
-#endif /*  __G_VERSION_MACROS_H__ */
diff --git a/linux-x86/include/glib-2.0/glib/gwin32.h b/linux-x86/include/glib-2.0/glib/gwin32.h
deleted file mode 100644
index ae87a45..0000000
--- a/linux-x86/include/glib-2.0/glib/gwin32.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_WIN32_H__
-#define __G_WIN32_H__
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#include <glib/gtypes.h>
-
-#ifdef G_PLATFORM_WIN32
-
-G_BEGIN_DECLS
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-#ifdef G_OS_WIN32
-
-/*
- * To get prototypes for the following POSIXish functions, you have to
- * include the indicated non-POSIX headers. The functions are defined
- * in OLDNAMES.LIB (MSVC) or -lmoldname-msvc (mingw32). But note that
- * for POSIX functions that take or return file names in the system
- * codepage, in many cases you would want to use the GLib wrappers in
- * gstdio.h and UTF-8 instead.
- *
- * getcwd: <direct.h> (MSVC), <io.h> (mingw32)
- * getpid: <process.h>
- * access: <io.h>
- * unlink: <stdio.h> or <io.h>
- * open, read, write, lseek, close: <io.h>
- * rmdir: <io.h>
- * pipe: <io.h> (actually, _pipe())
- */
-
-/* For some POSIX functions that are not provided by the MS runtime,
- * we provide emulation functions in glib, which are prefixed with
- * g_win32_. Or that was the idea at some time, but there is just one
- * of those:
- */
-GLIB_AVAILABLE_IN_ALL
-gint		g_win32_ftruncate	(gint		 f,
-					 guint		 size);
-#endif /* G_OS_WIN32 */
-
-/* The MS setlocale uses locale names of the form "English_United
- * States.1252" etc. We want the Unixish standard form "en", "zh_TW"
- * etc. This function gets the current thread locale from Windows and
- * returns it as a string of the above form for use in forming file
- * names etc. The returned string should be deallocated with g_free().
- */
-GLIB_AVAILABLE_IN_ALL
-gchar* 		g_win32_getlocale  (void);
-
-/* Translate a Win32 error code (as returned by GetLastError()) into
- * the corresponding message. The returned string should be deallocated
- * with g_free().
- */
-GLIB_AVAILABLE_IN_ALL
-gchar*          g_win32_error_message (gint error);
-
-#ifndef _WIN64
-GLIB_DEPRECATED
-gchar*          g_win32_get_package_installation_directory (const gchar *package,
-							    const gchar *dll_name);
-
-GLIB_DEPRECATED
-gchar*          g_win32_get_package_installation_subdirectory (const gchar *package,
-							       const gchar *dll_name,
-							       const gchar *subdir);
-#endif
-
-GLIB_AVAILABLE_IN_ALL
-gchar*          g_win32_get_package_installation_directory_of_module (gpointer hmodule);
-
-GLIB_AVAILABLE_IN_ALL
-guint		g_win32_get_windows_version (void);
-
-GLIB_AVAILABLE_IN_ALL
-gchar*          g_win32_locale_filename_from_utf8 (const gchar *utf8filename);
-
-/* As of GLib 2.14 we only support NT-based Windows */
-#define G_WIN32_IS_NT_BASED() TRUE
-#define G_WIN32_HAVE_WIDECHAR_API() TRUE
-
-G_END_DECLS
-
-#endif	 /* G_PLATFORM_WIN32 */
-
-#ifdef G_OS_WIN32
-#ifdef _WIN64
-#define g_win32_get_package_installation_directory g_win32_get_package_installation_directory_utf8
-#define g_win32_get_package_installation_subdirectory g_win32_get_package_installation_subdirectory_utf8
-#endif
-
-GLIB_AVAILABLE_IN_ALL
-gchar *g_win32_get_package_installation_directory_utf8    (const gchar *package,
-                                                           const gchar *dll_name);
-GLIB_AVAILABLE_IN_ALL
-gchar *g_win32_get_package_installation_subdirectory_utf8 (const gchar *package,
-                                                           const gchar *dll_name,
-                                                           const gchar *subdir);
-
-#endif /* G_OS_WIN32 */
-
-#endif /* __G_WIN32_H__ */
diff --git a/linux-x86/include/glib-2.0/gmodule.h b/linux-x86/include/glib-2.0/gmodule.h
deleted file mode 100644
index cb9b119..0000000
--- a/linux-x86/include/glib-2.0/gmodule.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* GMODULE - GLIB wrapper code for dynamic module loading
- * Copyright (C) 1998 Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GMODULE_H__
-#define __GMODULE_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* exporting and importing functions, this is special cased
- * to feature Windows dll stubs.
- */
-#define	G_MODULE_IMPORT		extern
-#ifdef G_PLATFORM_WIN32
-#  define	G_MODULE_EXPORT		__declspec(dllexport)
-#else /* !G_PLATFORM_WIN32 */
-#  define	G_MODULE_EXPORT
-#endif /* !G_PLATFORM_WIN32 */
-
-typedef enum
-{
-  G_MODULE_BIND_LAZY	= 1 << 0,
-  G_MODULE_BIND_LOCAL	= 1 << 1,
-  G_MODULE_BIND_MASK	= 0x03
-} GModuleFlags;
-
-typedef	struct _GModule			 GModule;
-typedef const gchar* (*GModuleCheckInit) (GModule	*module);
-typedef void	     (*GModuleUnload)	 (GModule	*module);
-
-/* return TRUE if dynamic module loading is supported */
-GLIB_AVAILABLE_IN_ALL
-gboolean	g_module_supported	   (void) G_GNUC_CONST;
-
-/* open a module 'file_name' and return handle, which is NULL on error */
-GLIB_AVAILABLE_IN_ALL
-GModule*              g_module_open          (const gchar  *file_name,
-					      GModuleFlags  flags);
-
-/* close a previously opened module, returns TRUE on success */
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_module_close         (GModule      *module);
-
-/* make a module resident so g_module_close on it will be ignored */
-GLIB_AVAILABLE_IN_ALL
-void                  g_module_make_resident (GModule      *module);
-
-/* query the last module error as a string */
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_module_error         (void);
-
-/* retrieve a symbol pointer from 'module', returns TRUE on success */
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_module_symbol        (GModule      *module,
-					      const gchar  *symbol_name,
-					      gpointer     *symbol);
-
-/* retrieve the file name from an existing module */
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_module_name          (GModule      *module);
-
-/* Build the actual file name containing a module. 'directory' is the
- * directory where the module file is supposed to be, or NULL or empty
- * in which case it should either be in the current directory or, on
- * some operating systems, in some standard place, for instance on the
- * PATH. Hence, to be absoultely sure to get the correct module,
- * always pass in a directory. The file name consists of the directory,
- * if supplied, and 'module_name' suitably decorated according to
- * the operating system's conventions (for instance lib*.so or *.dll).
- *
- * No checks are made that the file exists, or is of correct type.
- */
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_module_build_path    (const gchar  *directory,
-					      const gchar  *module_name);
-
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_module_open g_module_open_utf8
-#define g_module_name g_module_name_utf8
-
-GLIB_AVAILABLE_IN_ALL
-GModule *    g_module_open_utf8 (const gchar  *file_name,
-                                 GModuleFlags  flags);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_module_name_utf8 (GModule      *module);
-#endif
-#endif
-
-G_END_DECLS
-
-#endif /* __GMODULE_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gbinding.h b/linux-x86/include/glib-2.0/gobject/gbinding.h
deleted file mode 100644
index 82677ca..0000000
--- a/linux-x86/include/glib-2.0/gobject/gbinding.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* gbinding.h: Binding for object properties
- *
- * Copyright (C) 2010  Intel Corp.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Emmanuele Bassi <ebassi@linux.intel.com>
- */
-
-#ifndef __G_BINDING_H__
-#define __G_BINDING_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include <glib.h>
-#include <gobject/gobject.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_BINDING_FLAGS    (g_binding_flags_get_type ())
-
-#define G_TYPE_BINDING          (g_binding_get_type ())
-#define G_BINDING(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_BINDING, GBinding))
-#define G_IS_BINDING(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_BINDING))
-
-/**
- * GBinding:
- *
- * <structname>GBinding</structname> is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.26
- */
-typedef struct _GBinding        GBinding;
-
-/**
- * GBindingTransformFunc:
- * @binding: a #GBinding
- * @from_value: the #GValue containing the value to transform
- * @to_value: the #GValue in which to store the transformed value
- * @user_data: data passed to the transform function
- *
- * A function to be called to transform @from_value to @to_value. If
- * this is the @transform_to function of a binding, then @from_value
- * is the @source_property on the @source object, and @to_value is the
- * @target_property on the @target object. If this is the
- * @transform_from function of a %G_BINDING_BIDIRECTIONAL binding,
- * then those roles are reversed.
- *
- * Return value: %TRUE if the transformation was successful, and %FALSE
- *   otherwise
- *
- * Since: 2.26
- */
-typedef gboolean (* GBindingTransformFunc) (GBinding     *binding,
-                                            const GValue *from_value,
-                                            GValue       *to_value,
-                                            gpointer      user_data);
-
-/**
- * GBindingFlags:
- * @G_BINDING_DEFAULT: The default binding; if the source property
- *   changes, the target property is updated with its value.
- * @G_BINDING_BIDIRECTIONAL: Bidirectional binding; if either the
- *   property of the source or the property of the target changes,
- *   the other is updated.
- * @G_BINDING_SYNC_CREATE: Synchronize the values of the source and
- *   target properties when creating the binding; the direction of
- *   the synchronization is always from the source to the target.
- * @G_BINDING_INVERT_BOOLEAN: If the two properties being bound are
- *   booleans, setting one to %TRUE will result in the other being
- *   set to %FALSE and vice versa. This flag will only work for
- *   boolean properties, and cannot be used when passing custom
- *   transformation functions to g_object_bind_property_full().
- *
- * Flags to be passed to g_object_bind_property() or
- * g_object_bind_property_full().
- *
- * This enumeration can be extended at later date.
- *
- * Since: 2.26
- */
-typedef enum { /*< prefix=G_BINDING >*/
-  G_BINDING_DEFAULT        = 0,
-
-  G_BINDING_BIDIRECTIONAL  = 1 << 0,
-  G_BINDING_SYNC_CREATE    = 1 << 1,
-  G_BINDING_INVERT_BOOLEAN = 1 << 2
-} GBindingFlags;
-
-GLIB_AVAILABLE_IN_ALL
-GType                 g_binding_flags_get_type      (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType                 g_binding_get_type            (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_ALL
-GBindingFlags         g_binding_get_flags           (GBinding *binding);
-GLIB_AVAILABLE_IN_ALL
-GObject *             g_binding_get_source          (GBinding *binding);
-GLIB_AVAILABLE_IN_ALL
-GObject *             g_binding_get_target          (GBinding *binding);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_binding_get_source_property (GBinding *binding);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_binding_get_target_property (GBinding *binding);
-GLIB_AVAILABLE_IN_2_38
-void                  g_binding_unbind              (GBinding *binding);
-
-GLIB_AVAILABLE_IN_ALL
-GBinding *g_object_bind_property               (gpointer               source,
-                                                const gchar           *source_property,
-                                                gpointer               target,
-                                                const gchar           *target_property,
-                                                GBindingFlags          flags);
-GLIB_AVAILABLE_IN_ALL
-GBinding *g_object_bind_property_full          (gpointer               source,
-                                                const gchar           *source_property,
-                                                gpointer               target,
-                                                const gchar           *target_property,
-                                                GBindingFlags          flags,
-                                                GBindingTransformFunc  transform_to,
-                                                GBindingTransformFunc  transform_from,
-                                                gpointer               user_data,
-                                                GDestroyNotify         notify);
-GLIB_AVAILABLE_IN_ALL
-GBinding *g_object_bind_property_with_closures (gpointer               source,
-                                                const gchar           *source_property,
-                                                gpointer               target,
-                                                const gchar           *target_property,
-                                                GBindingFlags          flags,
-                                                GClosure              *transform_to,
-                                                GClosure              *transform_from);
-
-G_END_DECLS
-
-#endif /* __G_BINDING_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gboxed.h b/linux-x86/include/glib-2.0/gobject/gboxed.h
deleted file mode 100644
index 5f6b915..0000000
--- a/linux-x86/include/glib-2.0/gobject/gboxed.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __G_BOXED_H__
-#define __G_BOXED_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include        <gobject/gtype.h>
-
-#ifndef __GI_SCANNER__
-#include        <gobject/glib-types.h>
-#endif
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_IS_BOXED(type)      (G_TYPE_FUNDAMENTAL (type) == G_TYPE_BOXED)
-/**
- * G_VALUE_HOLDS_BOXED:
- * @value: a valid #GValue structure
- *
- * Checks whether the given #GValue can hold values derived
- * from type %G_TYPE_BOXED.
- *
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_BOXED(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_BOXED))
-
-
-/* --- typedefs --- */
-/**
- * GBoxedCopyFunc:
- * @boxed: The boxed structure to be copied.
- *
- * This function is provided by the user and should produce a copy
- * of the passed in boxed structure.
- *
- * Returns: The newly created copy of the boxed structure.
- */
-typedef gpointer (*GBoxedCopyFunc) (gpointer boxed);
-
-/**
- * GBoxedFreeFunc:
- * @boxed: The boxed structure to be freed.
- *
- * This function is provided by the user and should free the boxed
- * structure passed.
- */
-typedef void (*GBoxedFreeFunc) (gpointer boxed);
-
-
-/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
-gpointer g_boxed_copy                     (GType boxed_type,
-                                           gconstpointer  src_boxed);
-GLIB_AVAILABLE_IN_ALL
-void     g_boxed_free                     (GType          boxed_type,
-                                           gpointer       boxed);
-GLIB_AVAILABLE_IN_ALL
-void     g_value_set_boxed                (GValue        *value,
-                                           gconstpointer  v_boxed);
-GLIB_AVAILABLE_IN_ALL
-void     g_value_set_static_boxed         (GValue        *value,
-                                           gconstpointer  v_boxed);
-GLIB_AVAILABLE_IN_ALL
-void     g_value_take_boxed               (GValue        *value,
-                                           gconstpointer  v_boxed);
-GLIB_DEPRECATED_FOR(g_value_take_boxed)
-void     g_value_set_boxed_take_ownership (GValue        *value,
-                                           gconstpointer  v_boxed);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_value_get_boxed                (const GValue  *value);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_value_dup_boxed                (const GValue  *value);
-
-
-/* --- convenience --- */
-GLIB_AVAILABLE_IN_ALL
-GType    g_boxed_type_register_static     (const gchar   *name,
-                                           GBoxedCopyFunc boxed_copy,
-                                           GBoxedFreeFunc boxed_free);
-
-/* --- GObject boxed types --- */
-/**
- * G_TYPE_CLOSURE:
- *
- * The #GType for #GClosure.
- */
-#define G_TYPE_CLOSURE (g_closure_get_type ())
-
-/**
- * G_TYPE_VALUE:
- *
- * The type ID of the "GValue" type which is a boxed type,
- * used to pass around pointers to GValues.
- */
-#define G_TYPE_VALUE (g_value_get_type ())
-
-GLIB_AVAILABLE_IN_ALL
-GType   g_closure_get_type         (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_value_get_type           (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif  /* __G_BOXED_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gclosure.h b/linux-x86/include/glib-2.0/gobject/gclosure.h
deleted file mode 100644
index f59aab5..0000000
--- a/linux-x86/include/glib-2.0/gobject/gclosure.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- * Copyright (C) 2005 Imendio AB
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __G_CLOSURE_H__
-#define __G_CLOSURE_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include        <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- defines --- */
-/**
- * G_CLOSURE_NEEDS_MARSHAL:
- * @closure: a #GClosure
- * 
- * Check if the closure still needs a marshaller. See g_closure_set_marshal().
- *
- * Returns: %TRUE if a #GClosureMarshal marshaller has not yet been set on 
- * @closure.
- */
-#define	G_CLOSURE_NEEDS_MARSHAL(closure) (((GClosure*) (closure))->marshal == NULL)
-/**
- * G_CLOSURE_N_NOTIFIERS:
- * @cl: a #GClosure
- * 
- * Get the total number of notifiers connected with the closure @cl. 
- * The count includes the meta marshaller, the finalize and invalidate notifiers 
- * and the marshal guards. Note that each guard counts as two notifiers. 
- * See g_closure_set_meta_marshal(), g_closure_add_finalize_notifier(),
- * g_closure_add_invalidate_notifier() and g_closure_add_marshal_guards().
- *
- * Returns: number of notifiers
- */
-#define	G_CLOSURE_N_NOTIFIERS(cl)	 (((cl)->n_guards << 1L) + \
-                                          (cl)->n_fnotifiers + (cl)->n_inotifiers)
-/**
- * G_CCLOSURE_SWAP_DATA:
- * @cclosure: a #GCClosure
- * 
- * Checks whether the user data of the #GCClosure should be passed as the
- * first parameter to the callback. See g_cclosure_new_swap().
- *
- * Returns: %TRUE if data has to be swapped.
- */
-#define	G_CCLOSURE_SWAP_DATA(cclosure)	 (((GClosure*) (cclosure))->derivative_flag)
-/**
- * G_CALLBACK:
- * @f: a function pointer.
- * 
- * Cast a function pointer to a #GCallback.
- */
-#define	G_CALLBACK(f)			 ((GCallback) (f))
-
-
-/* -- typedefs --- */
-typedef struct _GClosure		 GClosure;
-typedef struct _GClosureNotifyData	 GClosureNotifyData;
-
-/**
- * GCallback:
- * 
- * The type used for callback functions in structure definitions and function 
- * signatures. This doesn't mean that all callback functions must take no 
- * parameters and return void. The required signature of a callback function 
- * is determined by the context in which is used (e.g. the signal to which it 
- * is connected). Use G_CALLBACK() to cast the callback function to a #GCallback. 
- */
-typedef void  (*GCallback)              (void);
-/**
- * GClosureNotify:
- * @data: data specified when registering the notification callback
- * @closure: the #GClosure on which the notification is emitted
- * 
- * The type used for the various notification callbacks which can be registered
- * on closures.
- */
-typedef void  (*GClosureNotify)		(gpointer	 data,
-					 GClosure	*closure);
-/**
- * GClosureMarshal:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @n_param_values: the length of the @param_values array
- * @param_values: (array length=n_param_values): an array of
- *  #GValue<!-- -->s holding the arguments on which to invoke the
- *  callback of @closure
- * @invocation_hint: (allow-none): the invocation hint given as the
- *  last argument to g_closure_invoke()
- * @marshal_data: (allow-none): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * 
- * The type used for marshaller functions.
- */
-typedef void  (*GClosureMarshal)	(GClosure	*closure,
-					 GValue         *return_value,
-					 guint           n_param_values,
-					 const GValue   *param_values,
-					 gpointer        invocation_hint,
-					 gpointer	 marshal_data);
-
-typedef void (* GVaClosureMarshal) (GClosure *closure,
-				    GValue   *return_value,
-				    gpointer  instance,
-				    va_list   args,
-				    gpointer  marshal_data,
-				    int       n_params,
-				    GType    *param_types);
-
-/**
- * GCClosure:
- * @closure: the #GClosure
- * @callback: the callback function
- * 
- * A #GCClosure is a specialization of #GClosure for C function callbacks.
- */
-typedef struct _GCClosure		 GCClosure;
-
-
-/* --- structures --- */
-struct _GClosureNotifyData
-{
-  gpointer       data;
-  GClosureNotify notify;
-};
-/**
- * GClosure:
- * @in_marshal: Indicates whether the closure is currently being invoked with 
- *  g_closure_invoke()
- * @is_invalid: Indicates whether the closure has been invalidated by 
- *  g_closure_invalidate()
- * 
- * A #GClosure represents a callback supplied by the programmer.
- */
-struct _GClosure
-{
-  /*< private >*/
-  volatile      	guint	 ref_count : 15;
-  /* meta_marshal is not used anymore but must be zero for historical reasons
-     as it was exposed in the G_CLOSURE_N_NOTIFIERS macro */
-  volatile       	guint	 meta_marshal_nouse : 1;
-  volatile       	guint	 n_guards : 1;
-  volatile       	guint	 n_fnotifiers : 2;	/* finalization notifiers */
-  volatile       	guint	 n_inotifiers : 8;	/* invalidation notifiers */
-  volatile       	guint	 in_inotify : 1;
-  volatile       	guint	 floating : 1;
-  /*< protected >*/
-  volatile         	guint	 derivative_flag : 1;
-  /*< public >*/
-  volatile       	guint	 in_marshal : 1;
-  volatile       	guint	 is_invalid : 1;
-
-  /*< private >*/	void   (*marshal)  (GClosure       *closure,
-					    GValue /*out*/ *return_value,
-					    guint           n_param_values,
-					    const GValue   *param_values,
-					    gpointer        invocation_hint,
-					    gpointer	    marshal_data);
-  /*< protected >*/	gpointer data;
-
-  /*< private >*/	GClosureNotifyData *notifiers;
-
-  /* invariants/constrains:
-   * - ->marshal and ->data are _invalid_ as soon as ->is_invalid==TRUE
-   * - invocation of all inotifiers occours prior to fnotifiers
-   * - order of inotifiers is random
-   *   inotifiers may _not_ free/invalidate parameter values (e.g. ->data)
-   * - order of fnotifiers is random
-   * - each notifier may only be removed before or during its invocation
-   * - reference counting may only happen prior to fnotify invocation
-   *   (in that sense, fnotifiers are really finalization handlers)
-   */
-};
-/* closure for C function calls, callback() is the user function
- */
-struct _GCClosure
-{
-  GClosure	closure;
-  gpointer	callback;
-};
-
-
-/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
-GClosure* g_cclosure_new			(GCallback	callback_func,
-						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GLIB_AVAILABLE_IN_ALL
-GClosure* g_cclosure_new_swap			(GCallback	callback_func,
-						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GLIB_AVAILABLE_IN_ALL
-GClosure* g_signal_type_cclosure_new		(GType          itype,
-						 guint          struct_offset);
-
-
-/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
-GClosure* g_closure_ref				(GClosure	*closure);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_sink			(GClosure	*closure);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_unref			(GClosure	*closure);
-/* intimidating */
-GLIB_AVAILABLE_IN_ALL
-GClosure* g_closure_new_simple			(guint		 sizeof_closure,
-						 gpointer	 data);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_add_finalize_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_remove_finalize_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_add_invalidate_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_remove_invalidate_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_add_marshal_guards		(GClosure	*closure,
-						 gpointer        pre_marshal_data,
-						 GClosureNotify	 pre_marshal_notify,
-						 gpointer        post_marshal_data,
-						 GClosureNotify	 post_marshal_notify);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_set_marshal			(GClosure	*closure,
-						 GClosureMarshal marshal);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_set_meta_marshal		(GClosure       *closure,
-						 gpointer	 marshal_data,
-						 GClosureMarshal meta_marshal);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_invalidate			(GClosure	*closure);
-GLIB_AVAILABLE_IN_ALL
-void	  g_closure_invoke			(GClosure 	*closure,
-						 GValue	/*out*/	*return_value,
-						 guint		 n_param_values,
-						 const GValue	*param_values,
-						 gpointer	 invocation_hint);
-
-/* FIXME:
-   OK:  data_object::destroy		-> closure_invalidate();
-   MIS:	closure_invalidate()		-> disconnect(closure);
-   MIS:	disconnect(closure)		-> (unlink) closure_unref();
-   OK:	closure_finalize()		-> g_free (data_string);
-
-   random remarks:
-   - need marshaller repo with decent aliasing to base types
-   - provide marshaller collection, virtually covering anything out there
-*/
-
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_generic (GClosure     *closure,
-                                 GValue       *return_gvalue,
-                                 guint         n_param_values,
-                                 const GValue *param_values,
-                                 gpointer      invocation_hint,
-                                 gpointer      marshal_data);
-
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_generic_va (GClosure *closure,
-				    GValue   *return_value,
-				    gpointer  instance,
-				    va_list   args_list,
-				    gpointer  marshal_data,
-				    int       n_params,
-				    GType    *param_types);
-
-
-G_END_DECLS
-
-#endif /* __G_CLOSURE_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/genums.h b/linux-x86/include/glib-2.0/gobject/genums.h
deleted file mode 100644
index 8aa7b89..0000000
--- a/linux-x86/include/glib-2.0/gobject/genums.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __G_ENUMS_H__
-#define __G_ENUMS_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_IS_ENUM:
- * @type: a #GType ID.
- * 
- * Checks whether @type "is a" %G_TYPE_ENUM.
- *
- * Returns: %TRUE if @type "is a" %G_TYPE_ENUM.
- */
-#define G_TYPE_IS_ENUM(type)	       (G_TYPE_FUNDAMENTAL (type) == G_TYPE_ENUM)
-/**
- * G_ENUM_CLASS:
- * @class: a valid #GEnumClass
- * 
- * Casts a derived #GEnumClass structure into a #GEnumClass structure.
- */
-#define G_ENUM_CLASS(class)	       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_ENUM, GEnumClass))
-/**
- * G_IS_ENUM_CLASS:
- * @class: a #GEnumClass
- * 
- * Checks whether @class "is a" valid #GEnumClass structure of type %G_TYPE_ENUM
- * or derived.
- */
-#define G_IS_ENUM_CLASS(class)	       (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_ENUM))
-/**
- * G_ENUM_CLASS_TYPE:
- * @class: a #GEnumClass
- * 
- * Get the type identifier from a given #GEnumClass structure.
- *
- * Returns: the #GType
- */
-#define G_ENUM_CLASS_TYPE(class)       (G_TYPE_FROM_CLASS (class))
-/**
- * G_ENUM_CLASS_TYPE_NAME:
- * @class: a #GEnumClass
- * 
- * Get the static type name from a given #GEnumClass structure.
- *
- * Returns: the type name.
- */
-#define G_ENUM_CLASS_TYPE_NAME(class)  (g_type_name (G_ENUM_CLASS_TYPE (class)))
-
-
-/**
- * G_TYPE_IS_FLAGS:
- * @type: a #GType ID.
- *
- * Checks whether @type "is a" %G_TYPE_FLAGS. 
- *
- * Returns: %TRUE if @type "is a" %G_TYPE_FLAGS.
- */
-#define G_TYPE_IS_FLAGS(type)	       (G_TYPE_FUNDAMENTAL (type) == G_TYPE_FLAGS)
-/**
- * G_FLAGS_CLASS:
- * @class: a valid #GFlagsClass
- * 
- * Casts a derived #GFlagsClass structure into a #GFlagsClass structure.
- */
-#define G_FLAGS_CLASS(class)	       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_FLAGS, GFlagsClass))
-/**
- * G_IS_FLAGS_CLASS:
- * @class: a #GFlagsClass
- * 
- * Checks whether @class "is a" valid #GFlagsClass structure of type %G_TYPE_FLAGS
- * or derived.
- */
-#define G_IS_FLAGS_CLASS(class)        (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_FLAGS))
-/**
- * G_FLAGS_CLASS_TYPE:
- * @class: a #GFlagsClass
- * 
- * Get the type identifier from a given #GFlagsClass structure.
- *
- * Returns: the #GType
- */
-#define G_FLAGS_CLASS_TYPE(class)      (G_TYPE_FROM_CLASS (class))
-/**
- * G_FLAGS_CLASS_TYPE_NAME:
- * @class: a #GFlagsClass
- * 
- * Get the static type name from a given #GFlagsClass structure.
- *
- * Returns: the type name.
- */
-#define G_FLAGS_CLASS_TYPE_NAME(class) (g_type_name (G_FLAGS_CLASS_TYPE (class)))
-
-
-/**
- * G_VALUE_HOLDS_ENUM:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_ENUM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_ENUM(value)      (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_ENUM))
-/**
- * G_VALUE_HOLDS_FLAGS:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_FLAGS.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_FLAGS(value)     (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_FLAGS))
-
-
-/* --- enum/flag values & classes --- */
-typedef struct _GEnumClass  GEnumClass;
-typedef struct _GFlagsClass GFlagsClass;
-typedef struct _GEnumValue  GEnumValue;
-typedef struct _GFlagsValue GFlagsValue;
-
-/**
- * GEnumClass:
- * @g_type_class: the parent class
- * @minimum: the smallest possible value.
- * @maximum: the largest possible value.
- * @n_values: the number of possible values.
- * @values: an array of #GEnumValue structs describing the 
- *  individual values.
- * 
- * The class of an enumeration type holds information about its 
- * possible values.
- */
-struct	_GEnumClass
-{
-  GTypeClass  g_type_class;
-
-  /*< public >*/  
-  gint	      minimum;
-  gint	      maximum;
-  guint	      n_values;
-  GEnumValue *values;
-};
-/**
- * GFlagsClass:
- * @g_type_class: the parent class
- * @mask: a mask covering all possible values.
- * @n_values: the number of possible values.
- * @values: an array of #GFlagsValue structs describing the 
- *  individual values.
- * 
- * The class of a flags type holds information about its 
- * possible values.
- */
-struct	_GFlagsClass
-{
-  GTypeClass   g_type_class;
-  
-  /*< public >*/  
-  guint	       mask;
-  guint	       n_values;
-  GFlagsValue *values;
-};
-/**
- * GEnumValue:
- * @value: the enum value
- * @value_name: the name of the value
- * @value_nick: the nickname of the value
- * 
- * A structure which contains a single enum value, its name, and its
- * nickname.
- */
-struct _GEnumValue
-{
-  gint	 value;
-  const gchar *value_name;
-  const gchar *value_nick;
-};
-/**
- * GFlagsValue:
- * @value: the flags value
- * @value_name: the name of the value
- * @value_nick: the nickname of the value
- * 
- * A structure which contains a single flags value, its name, and its
- * nickname.
- */
-struct _GFlagsValue
-{
-  guint	 value;
-  const gchar *value_name;
-  const gchar *value_nick;
-};
-
-
-/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
-GEnumValue*	g_enum_get_value		(GEnumClass	*enum_class,
-						 gint		 value);
-GLIB_AVAILABLE_IN_ALL
-GEnumValue*	g_enum_get_value_by_name	(GEnumClass	*enum_class,
-						 const gchar	*name);
-GLIB_AVAILABLE_IN_ALL
-GEnumValue*	g_enum_get_value_by_nick	(GEnumClass	*enum_class,
-						 const gchar	*nick);
-GLIB_AVAILABLE_IN_ALL
-GFlagsValue*	g_flags_get_first_value		(GFlagsClass	*flags_class,
-						 guint		 value);
-GLIB_AVAILABLE_IN_ALL
-GFlagsValue*	g_flags_get_value_by_name	(GFlagsClass	*flags_class,
-						 const gchar	*name);
-GLIB_AVAILABLE_IN_ALL
-GFlagsValue*	g_flags_get_value_by_nick	(GFlagsClass	*flags_class,
-						 const gchar	*nick);
-GLIB_AVAILABLE_IN_ALL
-void            g_value_set_enum        	(GValue         *value,
-						 gint            v_enum);
-GLIB_AVAILABLE_IN_ALL
-gint            g_value_get_enum        	(const GValue   *value);
-GLIB_AVAILABLE_IN_ALL
-void            g_value_set_flags       	(GValue         *value,
-						 guint           v_flags);
-GLIB_AVAILABLE_IN_ALL
-guint           g_value_get_flags       	(const GValue   *value);
-
-
-
-/* --- registration functions --- */
-/* const_static_values is a NULL terminated array of enum/flags
- * values that is taken over!
- */
-GLIB_AVAILABLE_IN_ALL
-GType	g_enum_register_static	   (const gchar	      *name,
-				    const GEnumValue  *const_static_values);
-GLIB_AVAILABLE_IN_ALL
-GType	g_flags_register_static	   (const gchar	      *name,
-				    const GFlagsValue *const_static_values);
-/* functions to complete the type information
- * for enums/flags implemented by plugins
- */
-GLIB_AVAILABLE_IN_ALL
-void	g_enum_complete_type_info  (GType	       g_enum_type,
-				    GTypeInfo	      *info,
-				    const GEnumValue  *const_values);
-GLIB_AVAILABLE_IN_ALL
-void	g_flags_complete_type_info (GType	       g_flags_type,
-				    GTypeInfo	      *info,
-				    const GFlagsValue *const_values);
-
-G_END_DECLS
-
-#endif /* __G_ENUMS_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/glib-types.h b/linux-x86/include/glib-2.0/gobject/glib-types.h
deleted file mode 100644
index 663d790..0000000
--- a/linux-x86/include/glib-2.0/gobject/glib-types.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GLIB_TYPES_H__
-#define __GLIB_TYPES_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) && !defined(GLIB_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* A hack necesssary to preprocess this file with g-ir-scanner */
-#ifdef __GI_SCANNER__
-typedef gsize GType;
-#endif
-
-/* --- GLib boxed types --- */
-/**
- * G_TYPE_DATE:
- *
- * The #GType for #GDate.
- */
-#define G_TYPE_DATE (g_date_get_type ())
-
-/**
- * G_TYPE_STRV:
- *
- * The #GType for a boxed type holding a %NULL-terminated array of strings.
- *
- * The code fragments in the following example show the use of a property of
- * type #G_TYPE_STRV with g_object_class_install_property(), g_object_set()
- * and g_object_get().
- *
- * |[
- * g_object_class_install_property (object_class,
- *                                  PROP_AUTHORS,
- *                                  g_param_spec_boxed ("authors",
- *                                                      _("Authors"),
- *                                                      _("List of authors"),
- *                                                      G_TYPE_STRV,
- *                                                      G_PARAM_READWRITE));
- *
- * gchar *authors[] = { "Owen", "Tim", NULL };
- * g_object_set (obj, "authors", authors, NULL);
- *
- * gchar *writers[];
- * g_object_get (obj, "authors", &writers, NULL);
- * /&ast; do something with writers &ast;/
- * g_strfreev (writers);
- * ]|
- *
- * Since: 2.4
- */
-#define G_TYPE_STRV (g_strv_get_type ())
-
-/**
- * G_TYPE_GSTRING:
- *
- * The #GType for #GString.
- */
-#define G_TYPE_GSTRING (g_gstring_get_type ())
-
-/**
- * G_TYPE_HASH_TABLE:
- *
- * The #GType for a boxed type holding a #GHashTable reference.
- *
- * Since: 2.10
- */
-#define G_TYPE_HASH_TABLE (g_hash_table_get_type ())
-
-/**
- * G_TYPE_REGEX:
- *
- * The #GType for a boxed type holding a #GRegex reference.
- *
- * Since: 2.14
- */
-#define G_TYPE_REGEX (g_regex_get_type ())
-
-/**
- * G_TYPE_MATCH_INFO:
- *
- * The #GType for a boxed type holding a #GMatchInfo reference.
- *
- * Since: 2.30
- */
-#define G_TYPE_MATCH_INFO (g_match_info_get_type ())
-
-/**
- * G_TYPE_ARRAY:
- *
- * The #GType for a boxed type holding a #GArray reference.
- *
- * Since: 2.22
- */
-#define G_TYPE_ARRAY (g_array_get_type ())
-
-/**
- * G_TYPE_BYTE_ARRAY:
- *
- * The #GType for a boxed type holding a #GByteArray reference.
- *
- * Since: 2.22
- */
-#define G_TYPE_BYTE_ARRAY (g_byte_array_get_type ())
-
-/**
- * G_TYPE_PTR_ARRAY:
- *
- * The #GType for a boxed type holding a #GPtrArray reference.
- *
- * Since: 2.22
- */
-#define G_TYPE_PTR_ARRAY (g_ptr_array_get_type ())
-
-/**
- * G_TYPE_BYTES:
- *
- * The #GType for #GBytes.
- *
- * Since: 2.32
- */
-#define G_TYPE_BYTES (g_bytes_get_type ())
-
-/**
- * G_TYPE_VARIANT_TYPE:
- *
- * The #GType for a boxed type holding a #GVariantType.
- *
- * Since: 2.24
- */
-#define G_TYPE_VARIANT_TYPE (g_variant_type_get_gtype ())
-
-/**
- * G_TYPE_ERROR:
- *
- * The #GType for a boxed type holding a #GError.
- *
- * Since: 2.26
- */
-#define G_TYPE_ERROR (g_error_get_type ())
-
-/**
- * G_TYPE_DATE_TIME:
- *
- * The #GType for a boxed type holding a #GDateTime.
- *
- * Since: 2.26
- */
-#define G_TYPE_DATE_TIME (g_date_time_get_type ())
-
-/**
- * G_TYPE_TIME_ZONE:
- *
- * The #GType for a boxed type holding a #GTimeZone.
- *
- * Since: 2.34
- */
-#define G_TYPE_TIME_ZONE (g_time_zone_get_type ())
-
-/**
- * G_TYPE_IO_CHANNEL:
- *
- * The #GType for #GIOChannel.
- */
-#define G_TYPE_IO_CHANNEL (g_io_channel_get_type ())
-
-/**
- * G_TYPE_IO_CONDITION:
- *
- * The #GType for #GIOCondition.
- */
-#define G_TYPE_IO_CONDITION (g_io_condition_get_type ())
-
-/**
- * G_TYPE_VARIANT_BUILDER:
- *
- * The #GType for a boxed type holding a #GVariantBuilder.
- *
- * Since: 2.30
- */
-#define G_TYPE_VARIANT_BUILDER (g_variant_builder_get_type ())
-
-/**
- * G_TYPE_MAIN_LOOP:
- *
- * The #GType for a boxed type holding a #GMainLoop.
- *
- * Since: 2.30
- */
-#define G_TYPE_MAIN_LOOP (g_main_loop_get_type ())
-
-/**
- * G_TYPE_MAIN_CONTEXT:
- *
- * The #GType for a boxed type holding a #GMainContext.
- *
- * Since: 2.30
- */
-#define G_TYPE_MAIN_CONTEXT (g_main_context_get_type ())
-
-/**
- * G_TYPE_SOURCE:
- *
- * The #GType for a boxed type holding a #GSource.
- *
- * Since: 2.30
- */
-#define G_TYPE_SOURCE (g_source_get_type ())
-
-/**
- * G_TYPE_POLLFD:
- *
- * The #GType for a boxed type holding a #GPollFD.
- *
- * Since: 2.36
- */
-#define G_TYPE_POLLFD (g_pollfd_get_type ())
-
-/**
- * G_TYPE_MARKUP_PARSE_CONTEXT:
- *
- * The #GType for a boxed type holding a #GMarkupParseContext.
- *
- * Since: 2.36
- */
-#define G_TYPE_MARKUP_PARSE_CONTEXT (g_markup_parse_context_get_type ())
-
-/**
- * G_TYPE_KEY_FILE:
- *
- * The #GType for a boxed type holding a #GKeyFile.
- *
- * Since: 2.32
- */
-#define G_TYPE_KEY_FILE (g_key_file_get_type ())
-
-/**
- * G_TYPE_THREAD:
- *
- * The #GType for a boxed type holding a #GThread.
- *
- * Since: 2.36
- */
-#define G_TYPE_THREAD (g_thread_get_type ())
-
-/**
- * G_TYPE_CHECKSUM:
- *
- * The #GType for a boxed type holding a #GChecksum.
- *
- * Since: 2.36
- */
-#define G_TYPE_CHECKSUM (g_checksum_get_type ())
-
-GLIB_AVAILABLE_IN_ALL
-GType   g_date_get_type            (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_strv_get_type            (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_gstring_get_type         (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_hash_table_get_type      (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_array_get_type           (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_byte_array_get_type      (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_ptr_array_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_bytes_get_type           (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_variant_type_get_gtype   (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_regex_get_type           (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_match_info_get_type      (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_error_get_type           (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_date_time_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_time_zone_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_io_channel_get_type      (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_io_condition_get_type    (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_variant_builder_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-GType   g_key_file_get_type        (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_main_loop_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_main_context_get_type    (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_source_get_type          (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
-GType   g_pollfd_get_type          (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
-GType   g_thread_get_type          (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
-GType   g_checksum_get_type        (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
-GType   g_markup_parse_context_get_type (void) G_GNUC_CONST;
-
-GLIB_DEPRECATED_FOR('G_TYPE_VARIANT')
-GType   g_variant_get_gtype        (void) G_GNUC_CONST;
-
-/**
- * GStrv:
- *
- * A C representable type name for #G_TYPE_STRV.
- */
-typedef gchar** GStrv;
-
-G_END_DECLS
-
-#endif  /* __GLIB_TYPES_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gmarshal.h b/linux-x86/include/glib-2.0/gobject/gmarshal.h
deleted file mode 100644
index d4fd76a..0000000
--- a/linux-x86/include/glib-2.0/gobject/gmarshal.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/* Note: This file is no longer generated.  See the comment in gmarshal.list */
-#ifndef __G_MARSHAL_H__
-#define __G_MARSHAL_H__
-
-G_BEGIN_DECLS
-
-/* VOID:VOID (./gmarshal.list:6) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__VOID (GClosure     *closure,
-                                    GValue       *return_value,
-                                    guint         n_param_values,
-                                    const GValue *param_values,
-                                    gpointer      invocation_hint,
-                                    gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__VOIDv (GClosure *closure,
-                                     GValue   *return_value,
-                                     gpointer  instance,
-                                     va_list   args,
-                                     gpointer  marshal_data,
-                                     int       n_params,
-                                     GType    *param_types);
-
-/* VOID:BOOLEAN (./gmarshal.list:7) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
-                                       GValue       *return_value,
-                                       guint         n_param_values,
-                                       const GValue *param_values,
-                                       gpointer      invocation_hint,
-                                       gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__BOOLEANv (GClosure *closure,
-                                        GValue   *return_value,
-                                        gpointer  instance,
-                                        va_list   args,
-                                        gpointer  marshal_data,
-                                        int       n_params,
-                                        GType    *param_types);
-
-/* VOID:CHAR (./gmarshal.list:8) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
-                                    GValue       *return_value,
-                                    guint         n_param_values,
-                                    const GValue *param_values,
-                                    gpointer      invocation_hint,
-                                    gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__CHARv (GClosure *closure,
-                                     GValue   *return_value,
-                                     gpointer  instance,
-                                     va_list   args,
-                                     gpointer  marshal_data,
-                                     int       n_params,
-                                     GType    *param_types);
-
-/* VOID:UCHAR (./gmarshal.list:9) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
-                                     GValue       *return_value,
-                                     guint         n_param_values,
-                                     const GValue *param_values,
-                                     gpointer      invocation_hint,
-                                     gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__UCHARv (GClosure *closure,
-                                      GValue   *return_value,
-                                      gpointer  instance,
-                                      va_list   args,
-                                      gpointer  marshal_data,
-                                      int       n_params,
-                                      GType    *param_types);
-
-/* VOID:INT (./gmarshal.list:10) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__INT (GClosure     *closure,
-                                   GValue       *return_value,
-                                   guint         n_param_values,
-                                   const GValue *param_values,
-                                   gpointer      invocation_hint,
-                                   gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__INTv (GClosure *closure,
-                                    GValue   *return_value,
-                                    gpointer  instance,
-                                    va_list   args,
-                                    gpointer  marshal_data,
-                                    int       n_params,
-                                    GType    *param_types);
-
-/* VOID:UINT (./gmarshal.list:11) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__UINT (GClosure     *closure,
-                                    GValue       *return_value,
-                                    guint         n_param_values,
-                                    const GValue *param_values,
-                                    gpointer      invocation_hint,
-                                    gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__UINTv (GClosure *closure,
-                                     GValue   *return_value,
-                                     gpointer  instance,
-                                     va_list   args,
-                                     gpointer  marshal_data,
-                                     int       n_params,
-                                     GType    *param_types);
-
-/* VOID:LONG (./gmarshal.list:12) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__LONG (GClosure     *closure,
-                                    GValue       *return_value,
-                                    guint         n_param_values,
-                                    const GValue *param_values,
-                                    gpointer      invocation_hint,
-                                    gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__LONGv (GClosure *closure,
-                                     GValue   *return_value,
-                                     gpointer  instance,
-                                     va_list   args,
-                                     gpointer  marshal_data,
-                                     int       n_params,
-                                     GType    *param_types);
-
-/* VOID:ULONG (./gmarshal.list:13) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
-                                     GValue       *return_value,
-                                     guint         n_param_values,
-                                     const GValue *param_values,
-                                     gpointer      invocation_hint,
-                                     gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__ULONGv (GClosure *closure,
-                                      GValue   *return_value,
-                                      gpointer  instance,
-                                      va_list   args,
-                                      gpointer  marshal_data,
-                                      int       n_params,
-                                      GType    *param_types);
-
-/* VOID:ENUM (./gmarshal.list:14) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
-                                    GValue       *return_value,
-                                    guint         n_param_values,
-                                    const GValue *param_values,
-                                    gpointer      invocation_hint,
-                                    gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__ENUMv (GClosure *closure,
-                                     GValue   *return_value,
-                                     gpointer  instance,
-                                     va_list   args,
-                                     gpointer  marshal_data,
-                                     int       n_params,
-                                     GType    *param_types);
-
-/* VOID:FLAGS (./gmarshal.list:15) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
-                                     GValue       *return_value,
-                                     guint         n_param_values,
-                                     const GValue *param_values,
-                                     gpointer      invocation_hint,
-                                     gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__FLAGSv (GClosure *closure,
-                                      GValue   *return_value,
-                                      gpointer  instance,
-                                      va_list   args,
-                                      gpointer  marshal_data,
-                                      int       n_params,
-                                      GType    *param_types);
-
-/* VOID:FLOAT (./gmarshal.list:16) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
-                                     GValue       *return_value,
-                                     guint         n_param_values,
-                                     const GValue *param_values,
-                                     gpointer      invocation_hint,
-                                     gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__FLOATv (GClosure *closure,
-                                      GValue   *return_value,
-                                      gpointer  instance,
-                                      va_list   args,
-                                      gpointer  marshal_data,
-                                      int       n_params,
-                                      GType    *param_types);
-
-/* VOID:DOUBLE (./gmarshal.list:17) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
-                                      GValue       *return_value,
-                                      guint         n_param_values,
-                                      const GValue *param_values,
-                                      gpointer      invocation_hint,
-                                      gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__DOUBLEv (GClosure *closure,
-                                       GValue   *return_value,
-                                       gpointer  instance,
-                                       va_list   args,
-                                       gpointer  marshal_data,
-                                       int       n_params,
-                                       GType    *param_types);
-
-/* VOID:STRING (./gmarshal.list:18) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__STRING (GClosure     *closure,
-                                      GValue       *return_value,
-                                      guint         n_param_values,
-                                      const GValue *param_values,
-                                      gpointer      invocation_hint,
-                                      gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__STRINGv (GClosure *closure,
-                                       GValue   *return_value,
-                                       gpointer  instance,
-                                       va_list   args,
-                                       gpointer  marshal_data,
-                                       int       n_params,
-                                       GType    *param_types);
-
-/* VOID:PARAM (./gmarshal.list:19) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
-                                     GValue       *return_value,
-                                     guint         n_param_values,
-                                     const GValue *param_values,
-                                     gpointer      invocation_hint,
-                                     gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__PARAMv (GClosure *closure,
-                                      GValue   *return_value,
-                                      gpointer  instance,
-                                      va_list   args,
-                                      gpointer  marshal_data,
-                                      int       n_params,
-                                      GType    *param_types);
-
-/* VOID:BOXED (./gmarshal.list:20) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
-                                     GValue       *return_value,
-                                     guint         n_param_values,
-                                     const GValue *param_values,
-                                     gpointer      invocation_hint,
-                                     gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__BOXEDv (GClosure *closure,
-                                      GValue   *return_value,
-                                      gpointer  instance,
-                                      va_list   args,
-                                      gpointer  marshal_data,
-                                      int       n_params,
-                                      GType    *param_types);
-
-/* VOID:POINTER (./gmarshal.list:21) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
-                                       GValue       *return_value,
-                                       guint         n_param_values,
-                                       const GValue *param_values,
-                                       gpointer      invocation_hint,
-                                       gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__POINTERv (GClosure *closure,
-                                        GValue   *return_value,
-                                        gpointer  instance,
-                                        va_list   args,
-                                        gpointer  marshal_data,
-                                        int       n_params,
-                                        GType    *param_types);
-
-/* VOID:OBJECT (./gmarshal.list:22) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
-                                      GValue       *return_value,
-                                      guint         n_param_values,
-                                      const GValue *param_values,
-                                      gpointer      invocation_hint,
-                                      gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__OBJECTv (GClosure *closure,
-                                       GValue   *return_value,
-                                       gpointer  instance,
-                                       va_list   args,
-                                       gpointer  marshal_data,
-                                       int       n_params,
-                                       GType    *param_types);
-
-/* VOID:VARIANT (./gmarshal.list:23) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
-                                       GValue       *return_value,
-                                       guint         n_param_values,
-                                       const GValue *param_values,
-                                       gpointer      invocation_hint,
-                                       gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__VARIANTv (GClosure *closure,
-                                        GValue   *return_value,
-                                        gpointer  instance,
-                                        va_list   args,
-                                        gpointer  marshal_data,
-                                        int       n_params,
-                                        GType    *param_types);
-
-/* VOID:UINT,POINTER (./gmarshal.list:26) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_VOID__UINT_POINTERv (GClosure *closure,
-                                             GValue   *return_value,
-                                             gpointer  instance,
-                                             va_list   args,
-                                             gpointer  marshal_data,
-                                             int       n_params,
-                                             GType    *param_types);
-
-/* BOOL:FLAGS (./gmarshal.list:27) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
-                                        GValue       *return_value,
-                                        guint         n_param_values,
-                                        const GValue *param_values,
-                                        gpointer      invocation_hint,
-                                        gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure *closure,
-                                         GValue   *return_value,
-                                         gpointer  instance,
-                                         va_list   args,
-                                         gpointer  marshal_data,
-                                         int       n_params,
-                                         GType    *param_types);
-#define g_cclosure_marshal_BOOL__FLAGS	g_cclosure_marshal_BOOLEAN__FLAGS
-
-/* STRING:OBJECT,POINTER (./gmarshal.list:28) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
-                                                GValue       *return_value,
-                                                guint         n_param_values,
-                                                const GValue *param_values,
-                                                gpointer      invocation_hint,
-                                                gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure *closure,
-                                                 GValue   *return_value,
-                                                 gpointer  instance,
-                                                 va_list   args,
-                                                 gpointer  marshal_data,
-                                                 int       n_params,
-                                                 GType    *param_types);
-
-/* BOOL:BOXED,BOXED (./gmarshal.list:29) */
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
-                                              GValue       *return_value,
-                                              guint         n_param_values,
-                                              const GValue *param_values,
-                                              gpointer      invocation_hint,
-                                              gpointer      marshal_data);
-GLIB_AVAILABLE_IN_ALL
-void g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure *closure,
-                                               GValue   *return_value,
-                                               gpointer  instance,
-                                               va_list   args,
-                                               gpointer  marshal_data,
-                                               int       n_params,
-                                               GType    *param_types);
-#define g_cclosure_marshal_BOOL__BOXED_BOXED	g_cclosure_marshal_BOOLEAN__BOXED_BOXED
-
-G_END_DECLS
-
-#endif /* __G_MARSHAL_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gobject.h b/linux-x86/include/glib-2.0/gobject/gobject.h
deleted file mode 100644
index 03a9629..0000000
--- a/linux-x86/include/glib-2.0/gobject/gobject.h
+++ /dev/null
@@ -1,670 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __G_OBJECT_H__
-#define __G_OBJECT_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include        <gobject/gtype.h>
-#include        <gobject/gvalue.h>
-#include        <gobject/gparam.h>
-#include        <gobject/gclosure.h>
-#include        <gobject/gsignal.h>
-#include        <gobject/gboxed.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_IS_OBJECT:
- * @type: Type id to check
- * 
- * Check if the passed in type id is a %G_TYPE_OBJECT or derived from it.
- * 
- * Returns: %FALSE or %TRUE, indicating whether @type is a %G_TYPE_OBJECT.
- */
-#define G_TYPE_IS_OBJECT(type)      (G_TYPE_FUNDAMENTAL (type) == G_TYPE_OBJECT)
-/**
- * G_OBJECT:
- * @object: Object which is subject to casting.
- * 
- * Casts a #GObject or derived pointer into a (GObject*) pointer.
- * Depending on the current debugging level, this function may invoke
- * certain runtime checks to identify invalid casts.
- */
-#define G_OBJECT(object)            (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_OBJECT, GObject))
-/**
- * G_OBJECT_CLASS:
- * @class: a valid #GObjectClass
- * 
- * Casts a derived #GObjectClass structure into a #GObjectClass structure.
- */
-#define G_OBJECT_CLASS(class)       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_OBJECT, GObjectClass))
-/**
- * G_IS_OBJECT:
- * @object: Instance to check for being a %G_TYPE_OBJECT.
- * 
- * Checks whether a valid #GTypeInstance pointer is of type %G_TYPE_OBJECT.
- */
-#define G_IS_OBJECT(object)         (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_OBJECT))
-/**
- * G_IS_OBJECT_CLASS:
- * @class: a #GObjectClass
- * 
- * Checks whether @class "is a" valid #GObjectClass structure of type
- * %G_TYPE_OBJECT or derived.
- */
-#define G_IS_OBJECT_CLASS(class)    (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_OBJECT))
-/**
- * G_OBJECT_GET_CLASS:
- * @object: a #GObject instance.
- * 
- * Get the class structure associated to a #GObject instance.
- *
- * Returns: pointer to object class structure.
- */
-#define G_OBJECT_GET_CLASS(object)  (G_TYPE_INSTANCE_GET_CLASS ((object), G_TYPE_OBJECT, GObjectClass))
-/**
- * G_OBJECT_TYPE:
- * @object: Object to return the type id for.
- * 
- * Get the type id of an object.
- * 
- * Returns: Type id of @object.
- */
-#define G_OBJECT_TYPE(object)       (G_TYPE_FROM_INSTANCE (object))
-/**
- * G_OBJECT_TYPE_NAME:
- * @object: Object to return the type name for.
- * 
- * Get the name of an object's type.
- * 
- * Returns: Type name of @object. The string is owned by the type system and 
- *  should not be freed.
- */
-#define G_OBJECT_TYPE_NAME(object)  (g_type_name (G_OBJECT_TYPE (object)))
-/**
- * G_OBJECT_CLASS_TYPE:
- * @class: a valid #GObjectClass
- * 
- * Get the type id of a class structure.
- * 
- * Returns: Type id of @class.
- */
-#define G_OBJECT_CLASS_TYPE(class)  (G_TYPE_FROM_CLASS (class))
-/**
- * G_OBJECT_CLASS_NAME:
- * @class: a valid #GObjectClass
- * 
- * Return the name of a class structure's type.
- * 
- * Returns: Type name of @class. The string is owned by the type system and 
- *  should not be freed.
- */
-#define G_OBJECT_CLASS_NAME(class)  (g_type_name (G_OBJECT_CLASS_TYPE (class)))
-/**
- * G_VALUE_HOLDS_OBJECT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_OBJECT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_OBJECT(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_OBJECT))
-
-/* --- type macros --- */
-/**
- * G_TYPE_INITIALLY_UNOWNED:
- * 
- * The type for #GInitiallyUnowned.
- */
-#define G_TYPE_INITIALLY_UNOWNED	      (g_initially_unowned_get_type())
-/**
- * G_INITIALLY_UNOWNED:
- * @object: Object which is subject to casting.
- * 
- * Casts a #GInitiallyUnowned or derived pointer into a (GInitiallyUnowned*) 
- * pointer. Depending on the current debugging level, this function may invoke
- * certain runtime checks to identify invalid casts.
- */
-#define G_INITIALLY_UNOWNED(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnowned))
-/**
- * G_INITIALLY_UNOWNED_CLASS:
- * @class: a valid #GInitiallyUnownedClass
- * 
- * Casts a derived #GInitiallyUnownedClass structure into a
- * #GInitiallyUnownedClass structure.
- */
-#define G_INITIALLY_UNOWNED_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnownedClass))
-/**
- * G_IS_INITIALLY_UNOWNED:
- * @object: Instance to check for being a %G_TYPE_INITIALLY_UNOWNED.
- * 
- * Checks whether a valid #GTypeInstance pointer is of type %G_TYPE_INITIALLY_UNOWNED.
- */
-#define G_IS_INITIALLY_UNOWNED(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_INITIALLY_UNOWNED))
-/**
- * G_IS_INITIALLY_UNOWNED_CLASS:
- * @class: a #GInitiallyUnownedClass
- * 
- * Checks whether @class "is a" valid #GInitiallyUnownedClass structure of type
- * %G_TYPE_INITIALLY_UNOWNED or derived.
- */
-#define G_IS_INITIALLY_UNOWNED_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_INITIALLY_UNOWNED))
-/**
- * G_INITIALLY_UNOWNED_GET_CLASS:
- * @object: a #GInitiallyUnowned instance.
- * 
- * Get the class structure associated to a #GInitiallyUnowned instance.
- *
- * Returns: pointer to object class structure.
- */
-#define G_INITIALLY_UNOWNED_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnownedClass))
-/* GInitiallyUnowned ia a GObject with initially floating reference count */
-
-
-/* --- typedefs & structures --- */
-typedef struct _GObject                  GObject;
-typedef struct _GObjectClass             GObjectClass;
-typedef struct _GObject                  GInitiallyUnowned;
-typedef struct _GObjectClass             GInitiallyUnownedClass;
-typedef struct _GObjectConstructParam    GObjectConstructParam;
-/**
- * GObjectGetPropertyFunc:
- * @object: a #GObject
- * @property_id: the numeric id under which the property was registered with
- *  g_object_class_install_property().
- * @value: a #GValue to return the property value in
- * @pspec: the #GParamSpec describing the property
- * 
- * The type of the @get_property function of #GObjectClass. 
- */
-typedef void (*GObjectGetPropertyFunc)  (GObject      *object,
-                                         guint         property_id,
-                                         GValue       *value,
-                                         GParamSpec   *pspec);
-/**
- * GObjectSetPropertyFunc:
- * @object: a #GObject
- * @property_id: the numeric id under which the property was registered with
- *  g_object_class_install_property().
- * @value: the new value for the property
- * @pspec: the #GParamSpec describing the property
- * 
- * The type of the @set_property function of #GObjectClass. 
- */
-typedef void (*GObjectSetPropertyFunc)  (GObject      *object,
-                                         guint         property_id,
-                                         const GValue *value,
-                                         GParamSpec   *pspec);
-/**
- * GObjectFinalizeFunc:
- * @object: the #GObject being finalized
- * 
- * The type of the @finalize function of #GObjectClass.
- */
-typedef void (*GObjectFinalizeFunc)     (GObject      *object);
-/**
- * GWeakNotify:
- * @data: data that was provided when the weak reference was established
- * @where_the_object_was: the object being finalized
- * 
- * A #GWeakNotify function can be added to an object as a callback that gets
- * triggered when the object is finalized. Since the object is already being
- * finalized when the #GWeakNotify is called, there's not much you could do 
- * with the object, apart from e.g. using its address as hash-index or the like. 
- */
-typedef void (*GWeakNotify)		(gpointer      data,
-					 GObject      *where_the_object_was);
-/**
- * GObject:
- * 
- * All the fields in the <structname>GObject</structname> structure are private 
- * to the #GObject implementation and should never be accessed directly.
- */
-struct  _GObject
-{
-  GTypeInstance  g_type_instance;
-  
-  /*< private >*/
-  volatile guint ref_count;
-  GData         *qdata;
-};
-/**
- * GObjectClass:
- * @g_type_class: the parent class
- * @constructor: the @constructor function is called by g_object_new () to 
- *  complete the object initialization after all the construction properties are
- *  set. The first thing a @constructor implementation must do is chain up to the
- *  @constructor of the parent class. Overriding @constructor should be rarely 
- *  needed, e.g. to handle construct properties, or to implement singletons.
- * @set_property: the generic setter for all properties of this type. Should be
- *  overridden for every type with properties. If implementations of
- *  @set_property don't emit property change notification explicitly, this will
- *  be done implicitly by the type system. However, if the notify signal is
- *  emitted explicitly, the type system will not emit it a second time.
- * @get_property: the generic getter for all properties of this type. Should be
- *  overridden for every type with properties.
- * @dispose: the @dispose function is supposed to drop all references to other 
- *  objects, but keep the instance otherwise intact, so that client method 
- *  invocations still work. It may be run multiple times (due to reference 
- *  loops). Before returning, @dispose should chain up to the @dispose method 
- *  of the parent class.
- * @finalize: instance finalization function, should finish the finalization of 
- *  the instance begun in @dispose and chain up to the @finalize method of the 
- *  parent class.
- * @dispatch_properties_changed: emits property change notification for a bunch
- *  of properties. Overriding @dispatch_properties_changed should be rarely 
- *  needed.
- * @notify: the class closure for the notify signal
- * @constructed: the @constructed function is called by g_object_new() as the
- *  final step of the object creation process.  At the point of the call, all
- *  construction properties have been set on the object.  The purpose of this
- *  call is to allow for object initialisation steps that can only be performed
- *  after construction properties have been set.  @constructed implementors
- *  should chain up to the @constructed call of their parent class to allow it
- *  to complete its initialisation.
- * 
- * The class structure for the <structname>GObject</structname> type.
- * 
- * <example>
- * <title>Implementing singletons using a constructor</title>
- * <programlisting>
- * static MySingleton *the_singleton = NULL;
- * 
- * static GObject*
- * my_singleton_constructor (GType                  type,
- *                           guint                  n_construct_params,
- *                           GObjectConstructParam *construct_params)
- * {
- *   GObject *object;
- *   
- *   if (!the_singleton)
- *     {
- *       object = G_OBJECT_CLASS (parent_class)->constructor (type,
- *                                                            n_construct_params,
- *                                                            construct_params);
- *       the_singleton = MY_SINGLETON (object);
- *     }
- *   else
- *     object = g_object_ref (G_OBJECT (the_singleton));
- * 
- *   return object;
- * }
- * </programlisting></example>
- */
-struct  _GObjectClass
-{
-  GTypeClass   g_type_class;
-
-  /*< private >*/
-  GSList      *construct_properties;
-
-  /*< public >*/
-  /* seldom overidden */
-  GObject*   (*constructor)     (GType                  type,
-                                 guint                  n_construct_properties,
-                                 GObjectConstructParam *construct_properties);
-  /* overridable methods */
-  void       (*set_property)		(GObject        *object,
-                                         guint           property_id,
-                                         const GValue   *value,
-                                         GParamSpec     *pspec);
-  void       (*get_property)		(GObject        *object,
-                                         guint           property_id,
-                                         GValue         *value,
-                                         GParamSpec     *pspec);
-  void       (*dispose)			(GObject        *object);
-  void       (*finalize)		(GObject        *object);
-  /* seldom overidden */
-  void       (*dispatch_properties_changed) (GObject      *object,
-					     guint	   n_pspecs,
-					     GParamSpec  **pspecs);
-  /* signals */
-  void	     (*notify)			(GObject	*object,
-					 GParamSpec	*pspec);
-
-  /* called when done constructing */
-  void	     (*constructed)		(GObject	*object);
-
-  /*< private >*/
-  gsize		flags;
-
-  /* padding */
-  gpointer	pdummy[6];
-};
-/**
- * GObjectConstructParam:
- * @pspec: the #GParamSpec of the construct parameter
- * @value: the value to set the parameter to
- * 
- * The <structname>GObjectConstructParam</structname> struct is an auxiliary 
- * structure used to hand #GParamSpec/#GValue pairs to the @constructor of
- * a #GObjectClass.
- */
-struct _GObjectConstructParam
-{
-  GParamSpec *pspec;
-  GValue     *value;
-};
-
-/**
- * GInitiallyUnowned:
- * 
- * All the fields in the <structname>GInitiallyUnowned</structname> structure 
- * are private to the #GInitiallyUnowned implementation and should never be 
- * accessed directly.
- */
-/**
- * GInitiallyUnownedClass:
- * 
- * The class structure for the <structname>GInitiallyUnowned</structname> type.
- */
-
-
-/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
-GType       g_initially_unowned_get_type      (void);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_class_install_property   (GObjectClass   *oclass,
-					       guint           property_id,
-					       GParamSpec     *pspec);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec* g_object_class_find_property      (GObjectClass   *oclass,
-					       const gchar    *property_name);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec**g_object_class_list_properties    (GObjectClass   *oclass,
-					       guint	      *n_properties);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_class_override_property  (GObjectClass   *oclass,
-					       guint           property_id,
-					       const gchar    *name);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_class_install_properties (GObjectClass   *oclass,
-                                               guint           n_pspecs,
-                                               GParamSpec    **pspecs);
-
-GLIB_AVAILABLE_IN_ALL
-void        g_object_interface_install_property (gpointer     g_iface,
-						 GParamSpec  *pspec);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec* g_object_interface_find_property    (gpointer     g_iface,
-						 const gchar *property_name);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec**g_object_interface_list_properties  (gpointer     g_iface,
-						 guint       *n_properties_p);
-
-GLIB_AVAILABLE_IN_ALL
-GType       g_object_get_type                 (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_object_new                      (GType           object_type,
-					       const gchar    *first_property_name,
-					       ...);
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_object_newv		      (GType           object_type,
-					       guint	       n_parameters,
-					       GParameter     *parameters);
-GLIB_AVAILABLE_IN_ALL
-GObject*    g_object_new_valist               (GType           object_type,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-GLIB_AVAILABLE_IN_ALL
-void	    g_object_set                      (gpointer	       object,
-					       const gchar    *first_property_name,
-					       ...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
-void        g_object_get                      (gpointer        object,
-					       const gchar    *first_property_name,
-					       ...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_object_connect                  (gpointer	       object,
-					       const gchar    *signal_spec,
-					       ...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
-void	    g_object_disconnect               (gpointer	       object,
-					       const gchar    *signal_spec,
-					       ...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
-void        g_object_set_valist               (GObject        *object,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_get_valist               (GObject        *object,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_set_property             (GObject        *object,
-					       const gchar    *property_name,
-					       const GValue   *value);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_get_property             (GObject        *object,
-					       const gchar    *property_name,
-					       GValue         *value);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_freeze_notify            (GObject        *object);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_notify                   (GObject        *object,
-					       const gchar    *property_name);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_notify_by_pspec          (GObject        *object,
-					       GParamSpec     *pspec);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_thaw_notify              (GObject        *object);
-GLIB_AVAILABLE_IN_ALL
-gboolean    g_object_is_floating    	      (gpointer        object);
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_object_ref_sink       	      (gpointer	       object);
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_object_ref                      (gpointer        object);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_unref                    (gpointer        object);
-GLIB_AVAILABLE_IN_ALL
-void	    g_object_weak_ref		      (GObject	      *object,
-					       GWeakNotify     notify,
-					       gpointer	       data);
-GLIB_AVAILABLE_IN_ALL
-void	    g_object_weak_unref		      (GObject	      *object,
-					       GWeakNotify     notify,
-					       gpointer	       data);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_add_weak_pointer         (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_remove_weak_pointer      (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-
-/**
- * GToggleNotify:
- * @data: Callback data passed to g_object_add_toggle_ref()
- * @object: The object on which g_object_add_toggle_ref() was called.
- * @is_last_ref: %TRUE if the toggle reference is now the
- *  last reference to the object. %FALSE if the toggle
- *  reference was the last reference and there are now other
- *  references.
- * 
- * A callback function used for notification when the state
- * of a toggle reference changes. See g_object_add_toggle_ref().
- */
-typedef void (*GToggleNotify) (gpointer      data,
-			       GObject      *object,
-			       gboolean      is_last_ref);
-
-GLIB_AVAILABLE_IN_ALL
-void g_object_add_toggle_ref    (GObject       *object,
-				 GToggleNotify  notify,
-				 gpointer       data);
-GLIB_AVAILABLE_IN_ALL
-void g_object_remove_toggle_ref (GObject       *object,
-				 GToggleNotify  notify,
-				 gpointer       data);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_object_get_qdata                (GObject        *object,
-					       GQuark          quark);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_set_qdata                (GObject        *object,
-					       GQuark          quark,
-					       gpointer        data);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_set_qdata_full           (GObject        *object,
-					       GQuark          quark,
-					       gpointer        data,
-					       GDestroyNotify  destroy);
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_object_steal_qdata              (GObject        *object,
-					       GQuark          quark);
-
-GLIB_AVAILABLE_IN_2_34
-gpointer    g_object_dup_qdata                (GObject        *object,
-                                               GQuark          quark,
-                                               GDuplicateFunc  dup_func,
-					       gpointer         user_data);
-GLIB_AVAILABLE_IN_2_34
-gboolean    g_object_replace_qdata            (GObject        *object,
-                                               GQuark          quark,
-                                               gpointer        oldval,
-                                               gpointer        newval,
-                                               GDestroyNotify  destroy,
-					       GDestroyNotify *old_destroy);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_object_get_data                 (GObject        *object,
-					       const gchar    *key);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_set_data                 (GObject        *object,
-					       const gchar    *key,
-					       gpointer        data);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_set_data_full            (GObject        *object,
-					       const gchar    *key,
-					       gpointer        data,
-					       GDestroyNotify  destroy);
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_object_steal_data               (GObject        *object,
-					       const gchar    *key);
-
-GLIB_AVAILABLE_IN_2_34
-gpointer    g_object_dup_data                 (GObject        *object,
-                                               const gchar    *key,
-                                               GDuplicateFunc  dup_func,
-					       gpointer         user_data);
-GLIB_AVAILABLE_IN_2_34
-gboolean    g_object_replace_data             (GObject        *object,
-                                               const gchar    *key,
-                                               gpointer        oldval,
-                                               gpointer        newval,
-                                               GDestroyNotify  destroy,
-					       GDestroyNotify *old_destroy);
-
-
-GLIB_AVAILABLE_IN_ALL
-void        g_object_watch_closure            (GObject        *object,
-					       GClosure       *closure);
-GLIB_AVAILABLE_IN_ALL
-GClosure*   g_cclosure_new_object             (GCallback       callback_func,
-					       GObject	      *object);
-GLIB_AVAILABLE_IN_ALL
-GClosure*   g_cclosure_new_object_swap        (GCallback       callback_func,
-					       GObject	      *object);
-GLIB_AVAILABLE_IN_ALL
-GClosure*   g_closure_new_object              (guint           sizeof_closure,
-					       GObject        *object);
-GLIB_AVAILABLE_IN_ALL
-void        g_value_set_object                (GValue         *value,
-					       gpointer        v_object);
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_value_get_object                (const GValue   *value);
-GLIB_AVAILABLE_IN_ALL
-gpointer    g_value_dup_object                (const GValue   *value);
-GLIB_AVAILABLE_IN_ALL
-gulong	    g_signal_connect_object           (gpointer	       instance,
-					       const gchar    *detailed_signal,
-					       GCallback       c_handler,
-					       gpointer	       gobject,
-					       GConnectFlags   connect_flags);
-
-/*< protected >*/
-GLIB_AVAILABLE_IN_ALL
-void        g_object_force_floating           (GObject        *object);
-GLIB_AVAILABLE_IN_ALL
-void        g_object_run_dispose	      (GObject	      *object);
-
-
-GLIB_AVAILABLE_IN_ALL
-void        g_value_take_object               (GValue         *value,
-					       gpointer        v_object);
-GLIB_DEPRECATED_FOR(g_value_take_object)
-void        g_value_set_object_take_ownership (GValue         *value,
-                                               gpointer        v_object);
-
-GLIB_DEPRECATED
-gsize	    g_object_compat_control	      (gsize	       what,
-					       gpointer	       data);
-
-/* --- implementation macros --- */
-#define G_OBJECT_WARN_INVALID_PSPEC(object, pname, property_id, pspec) \
-G_STMT_START { \
-  GObject *_glib__object = (GObject*) (object); \
-  GParamSpec *_glib__pspec = (GParamSpec*) (pspec); \
-  guint _glib__property_id = (property_id); \
-  g_warning ("%s: invalid %s id %u for \"%s\" of type '%s' in '%s'", \
-             G_STRLOC, \
-             (pname), \
-             _glib__property_id, \
-             _glib__pspec->name, \
-             g_type_name (G_PARAM_SPEC_TYPE (_glib__pspec)), \
-             G_OBJECT_TYPE_NAME (_glib__object)); \
-} G_STMT_END
-/**
- * G_OBJECT_WARN_INVALID_PROPERTY_ID:
- * @object: the #GObject on which set_property() or get_property() was called
- * @property_id: the numeric id of the property
- * @pspec: the #GParamSpec of the property
- * 
- * This macro should be used to emit a standard warning about unexpected 
- * properties in set_property() and get_property() implementations.
- */
-#define G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec) \
-    G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec))
-
-GLIB_AVAILABLE_IN_ALL
-void    g_clear_object (volatile GObject **object_ptr);
-#define g_clear_object(object_ptr) g_clear_pointer ((object_ptr), g_object_unref)
-
-typedef struct {
-    /*<private>*/
-    union { gpointer p; } priv;
-} GWeakRef;
-
-GLIB_AVAILABLE_IN_ALL
-void     g_weak_ref_init       (GWeakRef *weak_ref,
-                                gpointer  object);
-GLIB_AVAILABLE_IN_ALL
-void     g_weak_ref_clear      (GWeakRef *weak_ref);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_weak_ref_get        (GWeakRef *weak_ref);
-GLIB_AVAILABLE_IN_ALL
-void     g_weak_ref_set        (GWeakRef *weak_ref,
-                                gpointer  object);
-
-G_END_DECLS
-
-#endif /* __G_OBJECT_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gobjectnotifyqueue.c b/linux-x86/include/glib-2.0/gobject/gobjectnotifyqueue.c
deleted file mode 100644
index cfe01ba..0000000
--- a/linux-x86/include/glib-2.0/gobject/gobjectnotifyqueue.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* WARNING:
- *
- *    This file is INSTALLED and other projects (outside of glib)
- *    #include its contents.
- */
-
-#ifndef __G_OBJECT_NOTIFY_QUEUE_H__
-#define __G_OBJECT_NOTIFY_QUEUE_H__
-
-#include <string.h> /* memset */
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs --- */
-typedef struct _GObjectNotifyContext          GObjectNotifyContext;
-typedef struct _GObjectNotifyQueue            GObjectNotifyQueue;
-typedef void (*GObjectNotifyQueueDispatcher) (GObject     *object,
-					      guint        n_pspecs,
-					      GParamSpec **pspecs);
-
-
-/* --- structures --- */
-struct _GObjectNotifyContext
-{
-  GQuark                       quark_notify_queue;
-  GObjectNotifyQueueDispatcher dispatcher;
-  GTrashStack                 *_nqueue_trash; /* unused */
-};
-struct _GObjectNotifyQueue
-{
-  GObjectNotifyContext *context;
-  GSList               *pspecs;
-  guint16               n_pspecs;
-  guint16               freeze_count;
-};
-
-G_LOCK_DEFINE_STATIC(notify_lock);
-
-/* --- functions --- */
-static void
-g_object_notify_queue_free (gpointer data)
-{
-  GObjectNotifyQueue *nqueue = data;
-
-  g_slist_free (nqueue->pspecs);
-  g_slice_free (GObjectNotifyQueue, nqueue);
-}
-
-static inline GObjectNotifyQueue*
-g_object_notify_queue_freeze (GObject		   *object,
-			      GObjectNotifyContext *context)
-{
-  GObjectNotifyQueue *nqueue;
-
-  G_LOCK(notify_lock);
-  nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
-  if (!nqueue)
-    {
-      nqueue = g_slice_new0 (GObjectNotifyQueue);
-      nqueue->context = context;
-      g_datalist_id_set_data_full (&object->qdata, context->quark_notify_queue,
-				   nqueue, g_object_notify_queue_free);
-    }
-
-  if (nqueue->freeze_count >= 65535)
-    g_critical("Free queue for %s (%p) is larger than 65535,"
-               " called g_object_freeze_notify() too often."
-               " Forgot to call g_object_thaw_notify() or infinite loop",
-               G_OBJECT_TYPE_NAME (object), object);
-  else
-    nqueue->freeze_count++;
-  G_UNLOCK(notify_lock);
-
-  return nqueue;
-}
-
-static inline void
-g_object_notify_queue_thaw (GObject            *object,
-			    GObjectNotifyQueue *nqueue)
-{
-  GObjectNotifyContext *context = nqueue->context;
-  GParamSpec *pspecs_mem[16], **pspecs, **free_me = NULL;
-  GSList *slist;
-  guint n_pspecs = 0;
-
-  g_return_if_fail (nqueue->freeze_count > 0);
-  g_return_if_fail (g_atomic_int_get(&object->ref_count) > 0);
-
-  G_LOCK(notify_lock);
-
-  /* Just make sure we never get into some nasty race condition */
-  if (G_UNLIKELY(nqueue->freeze_count == 0)) {
-    G_UNLOCK(notify_lock);
-    g_warning ("%s: property-changed notification for %s(%p) is not frozen",
-	       G_STRFUNC, G_OBJECT_TYPE_NAME (object), object);
-    return;
-  }
-
-  nqueue->freeze_count--;
-  if (nqueue->freeze_count) {
-    G_UNLOCK(notify_lock);
-    return;
-  }
-
-  pspecs = nqueue->n_pspecs > 16 ? free_me = g_new (GParamSpec*, nqueue->n_pspecs) : pspecs_mem;
-
-  for (slist = nqueue->pspecs; slist; slist = slist->next)
-    {
-      pspecs[n_pspecs++] = slist->data;
-    }
-  g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL);
-
-  G_UNLOCK(notify_lock);
-
-  if (n_pspecs)
-    context->dispatcher (object, n_pspecs, pspecs);
-  g_free (free_me);
-}
-
-static inline void
-g_object_notify_queue_clear (GObject            *object,
-			     GObjectNotifyQueue *nqueue)
-{
-  g_return_if_fail (nqueue->freeze_count > 0);
-
-  G_LOCK(notify_lock);
-
-  g_slist_free (nqueue->pspecs);
-  nqueue->pspecs = NULL;
-  nqueue->n_pspecs = 0;
-
-  G_UNLOCK(notify_lock);
-}
-
-static inline void
-g_object_notify_queue_add (GObject            *object,
-			   GObjectNotifyQueue *nqueue,
-			   GParamSpec	      *pspec)
-{
-  if (pspec->flags & G_PARAM_READABLE)
-    {
-      GParamSpec *redirect;
-
-      G_LOCK(notify_lock);
-
-      g_return_if_fail (nqueue->n_pspecs < 65535);
-
-      redirect = g_param_spec_get_redirect_target (pspec);
-      if (redirect)
-	pspec = redirect;
-	    
-      /* we do the deduping in _thaw */
-      if (g_slist_find (nqueue->pspecs, pspec) == NULL)
-        {
-          nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec);
-          nqueue->n_pspecs++;
-        }
-
-      G_UNLOCK(notify_lock);
-    }
-}
-
-/* NB: This function is not threadsafe, do not ever use it if
- * you need a threadsafe notify queue.
- * Use g_object_notify_queue_freeze() to acquire the queue and
- * g_object_notify_queue_thaw() after you are done instead.
- */
-static inline GObjectNotifyQueue*
-g_object_notify_queue_from_object (GObject              *object,
-                                   GObjectNotifyContext *context)
-{
-  return g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
-}
-
-G_END_DECLS
-
-#endif /* __G_OBJECT_NOTIFY_QUEUE_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gparam.h b/linux-x86/include/glib-2.0/gobject/gparam.h
deleted file mode 100644
index 7e734e3..0000000
--- a/linux-x86/include/glib-2.0/gobject/gparam.h
+++ /dev/null
@@ -1,444 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gparam.h: GParamSpec base class implementation
- */
-#ifndef __G_PARAM_H__
-#define __G_PARAM_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-/**
- * G_TYPE_IS_PARAM:
- * @type: a #GType ID
- * 
- * Checks whether @type "is a" %G_TYPE_PARAM.
- */
-#define G_TYPE_IS_PARAM(type)		(G_TYPE_FUNDAMENTAL (type) == G_TYPE_PARAM)
-/**
- * G_PARAM_SPEC:
- * @pspec: a valid #GParamSpec
- * 
- * Casts a derived #GParamSpec object (e.g. of type #GParamSpecInt) into
- * a #GParamSpec object.
- */
-#define G_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM, GParamSpec))
-/**
- * G_IS_PARAM_SPEC:
- * @pspec: a #GParamSpec
- * 
- * Checks whether @pspec "is a" valid #GParamSpec structure of type %G_TYPE_PARAM
- * or derived.
- */
-#define G_IS_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM))
-/**
- * G_PARAM_SPEC_CLASS:
- * @pclass: a valid #GParamSpecClass
- * 
- * Casts a derived #GParamSpecClass structure into a #GParamSpecClass structure.
- */
-#define G_PARAM_SPEC_CLASS(pclass)      (G_TYPE_CHECK_CLASS_CAST ((pclass), G_TYPE_PARAM, GParamSpecClass))
-/**
- * G_IS_PARAM_SPEC_CLASS:
- * @pclass: a #GParamSpecClass
- * 
- * Checks whether @pclass "is a" valid #GParamSpecClass structure of type 
- * %G_TYPE_PARAM or derived.
- */
-#define G_IS_PARAM_SPEC_CLASS(pclass)   (G_TYPE_CHECK_CLASS_TYPE ((pclass), G_TYPE_PARAM))
-/**
- * G_PARAM_SPEC_GET_CLASS:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GParamSpecClass of a #GParamSpec.
- */
-#define G_PARAM_SPEC_GET_CLASS(pspec)	(G_TYPE_INSTANCE_GET_CLASS ((pspec), G_TYPE_PARAM, GParamSpecClass))
-
-
-/* --- convenience macros --- */
-/**
- * G_PARAM_SPEC_TYPE:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GType of this @pspec.
- */
-#define G_PARAM_SPEC_TYPE(pspec)	(G_TYPE_FROM_INSTANCE (pspec))
-/**
- * G_PARAM_SPEC_TYPE_NAME:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GType name of this @pspec.
- */
-#define G_PARAM_SPEC_TYPE_NAME(pspec)	(g_type_name (G_PARAM_SPEC_TYPE (pspec)))
-/**
- * G_PARAM_SPEC_VALUE_TYPE:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GType to initialize a #GValue for this parameter.
- */
-#define	G_PARAM_SPEC_VALUE_TYPE(pspec)	(G_PARAM_SPEC (pspec)->value_type)
-/**
- * G_VALUE_HOLDS_PARAM:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_PARAM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_PARAM(value)	(G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_PARAM))
-       
-
-/* --- flags --- */
-/**
- * GParamFlags:
- * @G_PARAM_READABLE: the parameter is readable
- * @G_PARAM_WRITABLE: the parameter is writable
- * @G_PARAM_CONSTRUCT: the parameter will be set upon object construction
- * @G_PARAM_CONSTRUCT_ONLY: the parameter will only be set upon object construction
- * @G_PARAM_LAX_VALIDATION: upon parameter conversion (see g_param_value_convert())
- *  strict validation is not required
- * @G_PARAM_STATIC_NAME: the string used as name when constructing the 
- *  parameter is guaranteed to remain valid and
- *  unmodified for the lifetime of the parameter. 
- *  Since 2.8
- * @G_PARAM_STATIC_NICK: the string used as nick when constructing the
- *  parameter is guaranteed to remain valid and
- *  unmmodified for the lifetime of the parameter.
- *  Since 2.8
- * @G_PARAM_STATIC_BLURB: the string used as blurb when constructing the 
- *  parameter is guaranteed to remain valid and 
- *  unmodified for the lifetime of the parameter. 
- *  Since 2.8
- * @G_PARAM_PRIVATE: internal
- * @G_PARAM_DEPRECATED: the parameter is deprecated and will be removed
- *  in a future version. A warning will be generated if it is used
- *  while running with G_ENABLE_DIAGNOSTIC=1.
- *  Since 2.26
- * 
- * Through the #GParamFlags flag values, certain aspects of parameters
- * can be configured. See also #G_PARAM_READWRITE and #G_PARAM_STATIC_STRINGS.
- */
-typedef enum
-{
-  G_PARAM_READABLE            = 1 << 0,
-  G_PARAM_WRITABLE            = 1 << 1,
-  G_PARAM_CONSTRUCT	      = 1 << 2,
-  G_PARAM_CONSTRUCT_ONLY      = 1 << 3,
-  G_PARAM_LAX_VALIDATION      = 1 << 4,
-  G_PARAM_STATIC_NAME	      = 1 << 5,
-#ifndef G_DISABLE_DEPRECATED
-  G_PARAM_PRIVATE	      = G_PARAM_STATIC_NAME,
-#endif
-  G_PARAM_STATIC_NICK	      = 1 << 6,
-  G_PARAM_STATIC_BLURB	      = 1 << 7,
-  /* User defined flags go up to 30 */
-  G_PARAM_DEPRECATED          = 1 << 31
-} GParamFlags;
-/**
- * G_PARAM_READWRITE:
- * 
- * #GParamFlags value alias for %G_PARAM_READABLE | %G_PARAM_WRITABLE.
- */
-#define	G_PARAM_READWRITE	(G_PARAM_READABLE | G_PARAM_WRITABLE)
-/**
- * G_PARAM_STATIC_STRINGS:
- * 
- * #GParamFlags value alias for %G_PARAM_STATIC_NAME | %G_PARAM_STATIC_NICK | %G_PARAM_STATIC_BLURB.
- * 
- * Since 2.13.0
- */
-#define	G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
-/* bits in the range 0xffffff00 are reserved for 3rd party usage */
-/**
- * G_PARAM_MASK:
- * 
- * Mask containing the bits of #GParamSpec.flags which are reserved for GLib.
- */
-#define	G_PARAM_MASK		(0x000000ff)
-/**
- * G_PARAM_USER_SHIFT:
- * 
- * Minimum shift count to be used for user defined flags, to be stored in
- * #GParamSpec.flags. The maximum allowed is 30 + G_PARAM_USER_SHIFT.
- */
-#define	G_PARAM_USER_SHIFT	(8)
-
-/* --- typedefs & structures --- */
-typedef struct _GParamSpec      GParamSpec;
-typedef struct _GParamSpecClass GParamSpecClass;
-typedef struct _GParameter	GParameter;
-typedef struct _GParamSpecPool  GParamSpecPool;
-/**
- * GParamSpec:
- * @g_type_instance: private #GTypeInstance portion
- * @name: name of this parameter: always an interned string
- * @flags: #GParamFlags flags for this parameter
- * @value_type: the #GValue type for this parameter
- * @owner_type: #GType type that uses (introduces) this parameter
- * 
- * All other fields of the <structname>GParamSpec</structname> struct are private and
- * should not be used directly.
- */
-struct _GParamSpec
-{
-  GTypeInstance  g_type_instance;
-
-  const gchar   *name;          /* interned string */
-  GParamFlags    flags;
-  GType		 value_type;
-  GType		 owner_type;	/* class or interface using this property */
-
-  /*< private >*/
-  gchar         *_nick;
-  gchar         *_blurb;
-  GData		*qdata;
-  guint          ref_count;
-  guint		 param_id;	/* sort-criteria */
-};
-/**
- * GParamSpecClass:
- * @g_type_class: the parent class
- * @value_type: the #GValue type for this parameter
- * @finalize: The instance finalization function (optional), should chain 
- *  up to the finalize method of the parent class.
- * @value_set_default: Resets a @value to the default value for this type
- *  (recommended, the default is g_value_reset()), see 
- *  g_param_value_set_default().
- * @value_validate: Ensures that the contents of @value comply with the 
- *  specifications set out by this type (optional), see 
- *  g_param_value_validate().
- * @values_cmp: Compares @value1 with @value2 according to this type
- *  (recommended, the default is memcmp()), see g_param_values_cmp().
- * 
- * The class structure for the <structname>GParamSpec</structname> type.
- * Normally, <structname>GParamSpec</structname> classes are filled by
- * g_param_type_register_static().
- */
-struct _GParamSpecClass
-{
-  GTypeClass      g_type_class;
-
-  GType		  value_type;
-
-  void	        (*finalize)		(GParamSpec   *pspec);
-
-  /* GParam methods */
-  void          (*value_set_default)    (GParamSpec   *pspec,
-					 GValue       *value);
-  gboolean      (*value_validate)       (GParamSpec   *pspec,
-					 GValue       *value);
-  gint          (*values_cmp)           (GParamSpec   *pspec,
-					 const GValue *value1,
-					 const GValue *value2);
-  /*< private >*/
-  gpointer	  dummy[4];
-};
-/**
- * GParameter:
- * @name: the parameter name
- * @value: the parameter value
- * 
- * The <structname>GParameter</structname> struct is an auxiliary structure used
- * to hand parameter name/value pairs to g_object_newv().
- */
-struct _GParameter /* auxiliary structure for _setv() variants */
-{
-  const gchar *name;
-  GValue       value;
-};
-
-
-/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_ref		(GParamSpec    *pspec);
-GLIB_AVAILABLE_IN_ALL
-void		g_param_spec_unref		(GParamSpec    *pspec);
-GLIB_AVAILABLE_IN_ALL
-void		g_param_spec_sink		(GParamSpec    *pspec);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_ref_sink   	(GParamSpec    *pspec);
-GLIB_AVAILABLE_IN_ALL
-gpointer        g_param_spec_get_qdata		(GParamSpec    *pspec,
-						 GQuark         quark);
-GLIB_AVAILABLE_IN_ALL
-void            g_param_spec_set_qdata		(GParamSpec    *pspec,
-						 GQuark         quark,
-						 gpointer       data);
-GLIB_AVAILABLE_IN_ALL
-void            g_param_spec_set_qdata_full	(GParamSpec    *pspec,
-						 GQuark         quark,
-						 gpointer       data,
-						 GDestroyNotify destroy);
-GLIB_AVAILABLE_IN_ALL
-gpointer        g_param_spec_steal_qdata	(GParamSpec    *pspec,
-						 GQuark         quark);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*     g_param_spec_get_redirect_target (GParamSpec   *pspec);
-
-GLIB_AVAILABLE_IN_ALL
-void		g_param_value_set_default	(GParamSpec    *pspec,
-						 GValue	       *value);
-GLIB_AVAILABLE_IN_ALL
-gboolean	g_param_value_defaults		(GParamSpec    *pspec,
-						 GValue	       *value);
-GLIB_AVAILABLE_IN_ALL
-gboolean	g_param_value_validate		(GParamSpec    *pspec,
-						 GValue	       *value);
-GLIB_AVAILABLE_IN_ALL
-gboolean	g_param_value_convert		(GParamSpec    *pspec,
-						 const GValue  *src_value,
-						 GValue	       *dest_value,
-						 gboolean	strict_validation);
-GLIB_AVAILABLE_IN_ALL
-gint		g_param_values_cmp		(GParamSpec    *pspec,
-						 const GValue  *value1,
-						 const GValue  *value2);
-GLIB_AVAILABLE_IN_ALL
-const gchar *   g_param_spec_get_name           (GParamSpec    *pspec);
-GLIB_AVAILABLE_IN_ALL
-const gchar *   g_param_spec_get_nick           (GParamSpec    *pspec);
-GLIB_AVAILABLE_IN_ALL
-const gchar *   g_param_spec_get_blurb          (GParamSpec    *pspec);
-GLIB_AVAILABLE_IN_ALL
-void            g_value_set_param               (GValue	       *value,
-						 GParamSpec    *param);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*     g_value_get_param               (const GValue  *value);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*     g_value_dup_param               (const GValue  *value);
-
-
-GLIB_AVAILABLE_IN_ALL
-void           g_value_take_param               (GValue        *value,
-					         GParamSpec    *param);
-GLIB_DEPRECATED_FOR(g_value_take_param)
-void           g_value_set_param_take_ownership (GValue        *value,
-                                                 GParamSpec    *param);
-GLIB_AVAILABLE_IN_2_36
-const GValue *  g_param_spec_get_default_value  (GParamSpec     *param);
-
-/* --- convenience functions --- */
-typedef struct _GParamSpecTypeInfo GParamSpecTypeInfo;
-/**
- * GParamSpecTypeInfo:
- * @instance_size: Size of the instance (object) structure.
- * @n_preallocs: Prior to GLib 2.10, it specified the number of pre-allocated (cached) instances to reserve memory for (0 indicates no caching). Since GLib 2.10, it is ignored, since instances are allocated with the <link linkend="glib-Memory-Slices">slice allocator</link> now.
- * @instance_init: Location of the instance initialization function (optional).
- * @value_type: The #GType of values conforming to this #GParamSpec
- * @finalize: The instance finalization function (optional).
- * @value_set_default: Resets a @value to the default value for @pspec 
- *  (recommended, the default is g_value_reset()), see 
- *  g_param_value_set_default().
- * @value_validate: Ensures that the contents of @value comply with the 
- *  specifications set out by @pspec (optional), see 
- *  g_param_value_validate().
- * @values_cmp: Compares @value1 with @value2 according to @pspec 
- *  (recommended, the default is memcmp()), see g_param_values_cmp().
- * 
- * This structure is used to provide the type system with the information
- * required to initialize and destruct (finalize) a parameter's class and
- * instances thereof.
- * The initialized structure is passed to the g_param_type_register_static() 
- * The type system will perform a deep copy of this structure, so its memory 
- * does not need to be persistent across invocation of 
- * g_param_type_register_static().
- */
-struct _GParamSpecTypeInfo
-{
-  /* type system portion */
-  guint16         instance_size;                               /* obligatory */
-  guint16         n_preallocs;                                 /* optional */
-  void		(*instance_init)	(GParamSpec   *pspec); /* optional */
-
-  /* class portion */
-  GType           value_type;				       /* obligatory */
-  void          (*finalize)             (GParamSpec   *pspec); /* optional */
-  void          (*value_set_default)    (GParamSpec   *pspec,  /* recommended */
-					 GValue       *value);
-  gboolean      (*value_validate)       (GParamSpec   *pspec,  /* optional */
-					 GValue       *value);
-  gint          (*values_cmp)           (GParamSpec   *pspec,  /* recommended */
-					 const GValue *value1,
-					 const GValue *value2);
-};
-GLIB_AVAILABLE_IN_ALL
-GType	g_param_type_register_static	(const gchar		  *name,
-					 const GParamSpecTypeInfo *pspec_info);
-
-/* For registering builting types */
-GType  _g_param_type_register_static_constant (const gchar              *name,
-					       const GParamSpecTypeInfo *pspec_info,
-					       GType                     opt_type);
-
-
-/* --- protected --- */
-GLIB_AVAILABLE_IN_ALL
-gpointer	g_param_spec_internal		(GType	        param_type,
-						 const gchar   *name,
-						 const gchar   *nick,
-						 const gchar   *blurb,
-						 GParamFlags    flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpecPool* g_param_spec_pool_new		(gboolean	type_prefixing);
-GLIB_AVAILABLE_IN_ALL
-void		g_param_spec_pool_insert	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec,
-						 GType		 owner_type);
-GLIB_AVAILABLE_IN_ALL
-void		g_param_spec_pool_remove	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_pool_lookup	(GParamSpecPool	*pool,
-						 const gchar	*param_name,
-						 GType		 owner_type,
-						 gboolean	 walk_ancestors);
-GLIB_AVAILABLE_IN_ALL
-GList*		g_param_spec_pool_list_owned	(GParamSpecPool	*pool,
-						 GType		 owner_type);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec**	g_param_spec_pool_list		(GParamSpecPool	*pool,
-						 GType		 owner_type,
-						 guint		*n_pspecs_p);
-
-
-/* contracts:
- *
- * gboolean value_validate (GParamSpec *pspec,
- *                          GValue     *value):
- *	modify value contents in the least destructive way, so
- *	that it complies with pspec's requirements (i.e.
- *	according to minimum/maximum ranges etc...). return
- *	whether modification was necessary.
- *
- * gint values_cmp (GParamSpec   *pspec,
- *                  const GValue *value1,
- *                  const GValue *value2):
- *	return value1 - value2, i.e. (-1) if value1 < value2,
- *	(+1) if value1 > value2, and (0) otherwise (equality)
- */
-
-G_END_DECLS
-
-#endif /* __G_PARAM_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gparamspecs.h b/linux-x86/include/glib-2.0/gobject/gparamspecs.h
deleted file mode 100644
index b3245a8..0000000
--- a/linux-x86/include/glib-2.0/gobject/gparamspecs.h
+++ /dev/null
@@ -1,1166 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gparamspecs.h: GLib default param specs
- */
-#ifndef __G_PARAMSPECS_H__
-#define __G_PARAMSPECS_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include        <gobject/gvalue.h>
-#include        <gobject/genums.h>
-#include        <gobject/gboxed.h>
-#include        <gobject/gobject.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_PARAM_CHAR:
- * 
- * The #GType of #GParamSpecChar.
- */
-#define	G_TYPE_PARAM_CHAR		   (g_param_spec_types[0])
-/**
- * G_IS_PARAM_SPEC_CHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_CHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_CHAR(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_CHAR))
-/**
- * G_PARAM_SPEC_CHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecChar.
- */
-#define G_PARAM_SPEC_CHAR(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_CHAR, GParamSpecChar))
-
-/**
- * G_TYPE_PARAM_UCHAR:
- * 
- * The #GType of #GParamSpecUChar.
- */
-#define	G_TYPE_PARAM_UCHAR		   (g_param_spec_types[1])
-/**
- * G_IS_PARAM_SPEC_UCHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UCHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UCHAR(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UCHAR))
-/**
- * G_PARAM_SPEC_UCHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUChar.
- */
-#define G_PARAM_SPEC_UCHAR(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UCHAR, GParamSpecUChar))
-
-/**
- * G_TYPE_PARAM_BOOLEAN:
- * 
- * The #GType of #GParamSpecBoolean.
- */
-#define	G_TYPE_PARAM_BOOLEAN		   (g_param_spec_types[2])
-/**
- * G_IS_PARAM_SPEC_BOOLEAN:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_BOOLEAN.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_BOOLEAN(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_BOOLEAN))
-/**
- * G_PARAM_SPEC_BOOLEAN:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecBoolean.
- */
-#define G_PARAM_SPEC_BOOLEAN(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_BOOLEAN, GParamSpecBoolean))
-
-/**
- * G_TYPE_PARAM_INT:
- * 
- * The #GType of #GParamSpecInt.
- */
-#define	G_TYPE_PARAM_INT		   (g_param_spec_types[3])
-/**
- * G_IS_PARAM_SPEC_INT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_INT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_INT(pspec)         (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_INT))
-/**
- * G_PARAM_SPEC_INT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecInt.
- */
-#define G_PARAM_SPEC_INT(pspec)            (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_INT, GParamSpecInt))
-
-/**
- * G_TYPE_PARAM_UINT:
- * 
- * The #GType of #GParamSpecUInt.
- */
-#define	G_TYPE_PARAM_UINT		   (g_param_spec_types[4])
-/**
- * G_IS_PARAM_SPEC_UINT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UINT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UINT(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UINT))
-/**
- * G_PARAM_SPEC_UINT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUInt.
- */
-#define G_PARAM_SPEC_UINT(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UINT, GParamSpecUInt))
-
-/**
- * G_TYPE_PARAM_LONG:
- * 
- * The #GType of #GParamSpecLong.
- */
-#define	G_TYPE_PARAM_LONG		   (g_param_spec_types[5])
-/**
- * G_IS_PARAM_SPEC_LONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_LONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_LONG(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_LONG))
-/**
- * G_PARAM_SPEC_LONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecLong.
- */
-#define G_PARAM_SPEC_LONG(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_LONG, GParamSpecLong))
-
-/**
- * G_TYPE_PARAM_ULONG:
- * 
- * The #GType of #GParamSpecULong.
- */
-#define	G_TYPE_PARAM_ULONG		   (g_param_spec_types[6])
-/**
- * G_IS_PARAM_SPEC_ULONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_ULONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_ULONG(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_ULONG))
-/**
- * G_PARAM_SPEC_ULONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecULong.
- */
-#define G_PARAM_SPEC_ULONG(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_ULONG, GParamSpecULong))
-
-/**
- * G_TYPE_PARAM_INT64:
- * 
- * The #GType of #GParamSpecInt64.
- */
-#define	G_TYPE_PARAM_INT64		   (g_param_spec_types[7])
-/**
- * G_IS_PARAM_SPEC_INT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_INT64.
- *
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_INT64(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_INT64))
-/**
- * G_PARAM_SPEC_INT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecInt64.
- */
-#define G_PARAM_SPEC_INT64(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_INT64, GParamSpecInt64))
-
-/**
- * G_TYPE_PARAM_UINT64:
- * 
- * The #GType of #GParamSpecUInt64.
- */
-#define	G_TYPE_PARAM_UINT64		   (g_param_spec_types[8])
-/**
- * G_IS_PARAM_SPEC_UINT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UINT64.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UINT64(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UINT64))
-/**
- * G_PARAM_SPEC_UINT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUInt64.
- */
-#define G_PARAM_SPEC_UINT64(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UINT64, GParamSpecUInt64))
-
-/**
- * G_TYPE_PARAM_UNICHAR:
- * 
- * The #GType of #GParamSpecUnichar.
- */
-#define	G_TYPE_PARAM_UNICHAR		   (g_param_spec_types[9])
-/**
- * G_PARAM_SPEC_UNICHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUnichar.
- */
-#define G_PARAM_SPEC_UNICHAR(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UNICHAR, GParamSpecUnichar))
-/**
- * G_IS_PARAM_SPEC_UNICHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UNICHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UNICHAR(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UNICHAR))
-
-/**
- * G_TYPE_PARAM_ENUM:
- * 
- * The #GType of #GParamSpecEnum.
- */
-#define	G_TYPE_PARAM_ENUM		   (g_param_spec_types[10])
-/**
- * G_IS_PARAM_SPEC_ENUM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_ENUM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_ENUM(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_ENUM))
-/**
- * G_PARAM_SPEC_ENUM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecEnum.
- */
-#define G_PARAM_SPEC_ENUM(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_ENUM, GParamSpecEnum))
-
-/**
- * G_TYPE_PARAM_FLAGS:
- * 
- * The #GType of #GParamSpecFlags.
- */
-#define	G_TYPE_PARAM_FLAGS		   (g_param_spec_types[11])
-/**
- * G_IS_PARAM_SPEC_FLAGS:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_FLAGS.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_FLAGS(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_FLAGS))
-/**
- * G_PARAM_SPEC_FLAGS:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecFlags.
- */
-#define G_PARAM_SPEC_FLAGS(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_FLAGS, GParamSpecFlags))
-
-/**
- * G_TYPE_PARAM_FLOAT:
- * 
- * The #GType of #GParamSpecFloat.
- */
-#define	G_TYPE_PARAM_FLOAT		   (g_param_spec_types[12])
-/**
- * G_IS_PARAM_SPEC_FLOAT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_FLOAT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_FLOAT(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_FLOAT))
-/**
- * G_PARAM_SPEC_FLOAT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecFloat.
- */
-#define G_PARAM_SPEC_FLOAT(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_FLOAT, GParamSpecFloat))
-
-/**
- * G_TYPE_PARAM_DOUBLE:
- * 
- * The #GType of #GParamSpecDouble.
- */
-#define	G_TYPE_PARAM_DOUBLE		   (g_param_spec_types[13])
-/**
- * G_IS_PARAM_SPEC_DOUBLE:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_DOUBLE.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_DOUBLE(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_DOUBLE))
-/**
- * G_PARAM_SPEC_DOUBLE:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecDouble.
- */
-#define G_PARAM_SPEC_DOUBLE(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_DOUBLE, GParamSpecDouble))
-
-/**
- * G_TYPE_PARAM_STRING:
- * 
- * The #GType of #GParamSpecString.
- */
-#define	G_TYPE_PARAM_STRING		   (g_param_spec_types[14])
-/**
- * G_IS_PARAM_SPEC_STRING:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_STRING.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_STRING(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_STRING))
-/**
- * G_PARAM_SPEC_STRING:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecString.
- */
-#define G_PARAM_SPEC_STRING(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_STRING, GParamSpecString))
-
-/**
- * G_TYPE_PARAM_PARAM:
- * 
- * The #GType of #GParamSpecParam.
- */
-#define	G_TYPE_PARAM_PARAM		   (g_param_spec_types[15])
-/**
- * G_IS_PARAM_SPEC_PARAM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_PARAM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_PARAM(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_PARAM))
-/**
- * G_PARAM_SPEC_PARAM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecParam.
- */
-#define G_PARAM_SPEC_PARAM(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_PARAM, GParamSpecParam))
-
-/**
- * G_TYPE_PARAM_BOXED:
- * 
- * The #GType of #GParamSpecBoxed.
- */
-#define	G_TYPE_PARAM_BOXED		   (g_param_spec_types[16])
-/**
- * G_IS_PARAM_SPEC_BOXED:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_BOXED.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_BOXED(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_BOXED))
-/**
- * G_PARAM_SPEC_BOXED:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecBoxed.
- */
-#define G_PARAM_SPEC_BOXED(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_BOXED, GParamSpecBoxed))
-
-/**
- * G_TYPE_PARAM_POINTER:
- * 
- * The #GType of #GParamSpecPointer.
- */
-#define	G_TYPE_PARAM_POINTER		   (g_param_spec_types[17])
-/**
- * G_IS_PARAM_SPEC_POINTER:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_POINTER.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_POINTER(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_POINTER))
-/**
- * G_PARAM_SPEC_POINTER:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecPointer.
- */
-#define G_PARAM_SPEC_POINTER(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_POINTER, GParamSpecPointer))
-
-/**
- * G_TYPE_PARAM_VALUE_ARRAY:
- * 
- * The #GType of #GParamSpecValueArray.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define	G_TYPE_PARAM_VALUE_ARRAY	   (g_param_spec_types[18])
-/**
- * G_IS_PARAM_SPEC_VALUE_ARRAY:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_VALUE_ARRAY.
- * 
- * Returns: %TRUE on success.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY))
-/**
- * G_PARAM_SPEC_VALUE_ARRAY:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecValueArray.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define G_PARAM_SPEC_VALUE_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY, GParamSpecValueArray))
-
-/**
- * G_TYPE_PARAM_OBJECT:
- * 
- * The #GType of #GParamSpecObject.
- */
-#define	G_TYPE_PARAM_OBJECT		   (g_param_spec_types[19])
-/**
- * G_IS_PARAM_SPEC_OBJECT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_OBJECT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_OBJECT(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_OBJECT))
-/**
- * G_PARAM_SPEC_OBJECT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecObject.
- */
-#define G_PARAM_SPEC_OBJECT(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_OBJECT, GParamSpecObject))
-
-/**
- * G_TYPE_PARAM_OVERRIDE:
- * 
- * The #GType of #GParamSpecOverride.
- * 
- * Since: 2.4
- */
-#define	G_TYPE_PARAM_OVERRIDE		   (g_param_spec_types[20])
-/**
- * G_IS_PARAM_SPEC_OVERRIDE:
- * @pspec: a #GParamSpec
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_OVERRIDE.
- * 
- * Since: 2.4
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_OVERRIDE(pspec)    (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_OVERRIDE))
-/**
- * G_PARAM_SPEC_OVERRIDE:
- * @pspec: a #GParamSpec
- * 
- * Casts a #GParamSpec into a #GParamSpecOverride.
- * 
- * Since: 2.4
- */
-#define G_PARAM_SPEC_OVERRIDE(pspec)       (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_OVERRIDE, GParamSpecOverride))
-
-/**
- * G_TYPE_PARAM_GTYPE:
- * 
- * The #GType of #GParamSpecGType.
- * 
- * Since: 2.10
- */
-#define	G_TYPE_PARAM_GTYPE		   (g_param_spec_types[21])
-/**
- * G_IS_PARAM_SPEC_GTYPE:
- * @pspec: a #GParamSpec
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_GTYPE.
- * 
- * Since: 2.10
- * Returns: %TRUE on success. 
- */
-#define G_IS_PARAM_SPEC_GTYPE(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_GTYPE))
-/**
- * G_PARAM_SPEC_GTYPE:
- * @pspec: a #GParamSpec
- * 
- * Casts a #GParamSpec into a #GParamSpecGType.
- * 
- * Since: 2.10
- */
-#define G_PARAM_SPEC_GTYPE(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_GTYPE, GParamSpecGType))
-
-/**
- * G_TYPE_PARAM_VARIANT:
- *
- * The #GType of #GParamSpecVariant.
- *
- * Since: 2.26
- */
-#define G_TYPE_PARAM_VARIANT                (g_param_spec_types[22])
-/**
- * G_IS_PARAM_SPEC_VARIANT:
- * @pspec: a #GParamSpec
- *
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_VARIANT.
- *
- * Returns: %TRUE on success
- *
- * Since: 2.26
- */
-#define G_IS_PARAM_SPEC_VARIANT(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VARIANT))
-/**
- * G_PARAM_SPEC_VARIANT:
- * @pspec: a #GParamSpec
- *
- * Casts a #GParamSpec into a #GParamSpecVariant.
- *
- * Since: 2.26
- */
-#define G_PARAM_SPEC_VARIANT(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VARIANT, GParamSpecVariant))
-
-/* --- typedefs & structures --- */
-typedef struct _GParamSpecChar       GParamSpecChar;
-typedef struct _GParamSpecUChar      GParamSpecUChar;
-typedef struct _GParamSpecBoolean    GParamSpecBoolean;
-typedef struct _GParamSpecInt        GParamSpecInt;
-typedef struct _GParamSpecUInt       GParamSpecUInt;
-typedef struct _GParamSpecLong       GParamSpecLong;
-typedef struct _GParamSpecULong      GParamSpecULong;
-typedef struct _GParamSpecInt64      GParamSpecInt64;
-typedef struct _GParamSpecUInt64     GParamSpecUInt64;
-typedef struct _GParamSpecUnichar    GParamSpecUnichar;
-typedef struct _GParamSpecEnum       GParamSpecEnum;
-typedef struct _GParamSpecFlags      GParamSpecFlags;
-typedef struct _GParamSpecFloat      GParamSpecFloat;
-typedef struct _GParamSpecDouble     GParamSpecDouble;
-typedef struct _GParamSpecString     GParamSpecString;
-typedef struct _GParamSpecParam      GParamSpecParam;
-typedef struct _GParamSpecBoxed      GParamSpecBoxed;
-typedef struct _GParamSpecPointer    GParamSpecPointer;
-typedef struct _GParamSpecValueArray GParamSpecValueArray;
-typedef struct _GParamSpecObject     GParamSpecObject;
-typedef struct _GParamSpecOverride   GParamSpecOverride;
-typedef struct _GParamSpecGType      GParamSpecGType;
-typedef struct _GParamSpecVariant    GParamSpecVariant;
-
-/**
- * GParamSpecChar:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for character properties.
- */
-struct _GParamSpecChar
-{
-  GParamSpec    parent_instance;
-  
-  gint8         minimum;
-  gint8         maximum;
-  gint8         default_value;
-};
-/**
- * GParamSpecUChar:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned character properties.
- */
-struct _GParamSpecUChar
-{
-  GParamSpec    parent_instance;
-  
-  guint8        minimum;
-  guint8        maximum;
-  guint8        default_value;
-};
-/**
- * GParamSpecBoolean:
- * @parent_instance: private #GParamSpec portion
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for boolean properties.
- */
-struct _GParamSpecBoolean
-{
-  GParamSpec    parent_instance;
-  
-  gboolean      default_value;
-};
-/**
- * GParamSpecInt:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for integer properties.
- */
-struct _GParamSpecInt
-{
-  GParamSpec    parent_instance;
-  
-  gint          minimum;
-  gint          maximum;
-  gint          default_value;
-};
-/**
- * GParamSpecUInt:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned integer properties.
- */
-struct _GParamSpecUInt
-{
-  GParamSpec    parent_instance;
-  
-  guint         minimum;
-  guint         maximum;
-  guint         default_value;
-};
-/**
- * GParamSpecLong:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for long integer properties.
- */
-struct _GParamSpecLong
-{
-  GParamSpec    parent_instance;
-  
-  glong         minimum;
-  glong         maximum;
-  glong         default_value;
-};
-/**
- * GParamSpecULong:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned long integer properties.
- */
-struct _GParamSpecULong
-{
-  GParamSpec    parent_instance;
-  
-  gulong        minimum;
-  gulong        maximum;
-  gulong        default_value;
-};
-/**
- * GParamSpecInt64:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for 64bit integer properties.
- */
-struct _GParamSpecInt64
-{
-  GParamSpec    parent_instance;
-  
-  gint64        minimum;
-  gint64        maximum;
-  gint64        default_value;
-};
-/**
- * GParamSpecUInt64:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned 64bit integer properties.
- */
-struct _GParamSpecUInt64
-{
-  GParamSpec    parent_instance;
-  
-  guint64       minimum;
-  guint64       maximum;
-  guint64       default_value;
-};
-/**
- * GParamSpecUnichar:
- * @parent_instance: private #GParamSpec portion
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unichar (unsigned integer) properties.
- */
-struct _GParamSpecUnichar
-{
-  GParamSpec    parent_instance;
-  
-  gunichar      default_value;
-};
-/**
- * GParamSpecEnum:
- * @parent_instance: private #GParamSpec portion
- * @enum_class: the #GEnumClass for the enum
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for enum 
- * properties.
- */
-struct _GParamSpecEnum
-{
-  GParamSpec    parent_instance;
-  
-  GEnumClass   *enum_class;
-  gint          default_value;
-};
-/**
- * GParamSpecFlags:
- * @parent_instance: private #GParamSpec portion
- * @flags_class: the #GFlagsClass for the flags
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for flags
- * properties.
- */
-struct _GParamSpecFlags
-{
-  GParamSpec    parent_instance;
-  
-  GFlagsClass  *flags_class;
-  guint         default_value;
-};
-/**
- * GParamSpecFloat:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * @epsilon: values closer than @epsilon will be considered identical
- *  by g_param_values_cmp(); the default value is 1e-30.
- * 
- * A #GParamSpec derived structure that contains the meta data for float properties.
- */
-struct _GParamSpecFloat
-{
-  GParamSpec    parent_instance;
-  
-  gfloat        minimum;
-  gfloat        maximum;
-  gfloat        default_value;
-  gfloat        epsilon;
-};
-/**
- * GParamSpecDouble:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * @epsilon: values closer than @epsilon will be considered identical
- *  by g_param_values_cmp(); the default value is 1e-90.
- * 
- * A #GParamSpec derived structure that contains the meta data for double properties.
- */
-struct _GParamSpecDouble
-{
-  GParamSpec    parent_instance;
-  
-  gdouble       minimum;
-  gdouble       maximum;
-  gdouble       default_value;
-  gdouble       epsilon;
-};
-/**
- * GParamSpecString:
- * @parent_instance: private #GParamSpec portion
- * @default_value: default value for the property specified
- * @cset_first: a string containing the allowed values for the first byte
- * @cset_nth: a string containing the allowed values for the subsequent bytes
- * @substitutor: the replacement byte for bytes which don't match @cset_first or @cset_nth.
- * @null_fold_if_empty: replace empty string by %NULL
- * @ensure_non_null: replace %NULL strings by an empty string
- * 
- * A #GParamSpec derived structure that contains the meta data for string
- * properties.
- */
-struct _GParamSpecString
-{
-  GParamSpec    parent_instance;
-  
-  gchar        *default_value;
-  gchar        *cset_first;
-  gchar        *cset_nth;
-  gchar         substitutor;
-  guint         null_fold_if_empty : 1;
-  guint         ensure_non_null : 1;
-};
-/**
- * GParamSpecParam:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for %G_TYPE_PARAM
- * properties.
- */
-struct _GParamSpecParam
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecBoxed:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for boxed properties.
- */
-struct _GParamSpecBoxed
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecPointer:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for pointer properties.
- */
-struct _GParamSpecPointer
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecValueArray:
- * @parent_instance: private #GParamSpec portion
- * @element_spec: a #GParamSpec describing the elements contained in arrays of this property, may be %NULL
- * @fixed_n_elements: if greater than 0, arrays of this property will always have this many elements
- * 
- * A #GParamSpec derived structure that contains the meta data for #GValueArray properties.
- */
-struct _GParamSpecValueArray
-{
-  GParamSpec    parent_instance;
-  GParamSpec   *element_spec;
-  guint		fixed_n_elements;
-};
-/**
- * GParamSpecObject:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for object properties.
- */
-struct _GParamSpecObject
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecOverride:
- * 
- * This is a type of #GParamSpec type that simply redirects operations to
- * another paramspec.  All operations other than getting or
- * setting the value are redirected, including accessing the nick and
- * blurb, validating a value, and so forth. See
- * g_param_spec_get_redirect_target() for retrieving the overidden
- * property. #GParamSpecOverride is used in implementing
- * g_object_class_override_property(), and will not be directly useful
- * unless you are implementing a new base type similar to GObject.
- * 
- * Since: 2.4
- */
-struct _GParamSpecOverride
-{
-  /*< private >*/
-  GParamSpec    parent_instance;
-  GParamSpec   *overridden;
-};
-/**
- * GParamSpecGType:
- * @parent_instance: private #GParamSpec portion
- * @is_a_type: a #GType whose subtypes can occur as values
- * 
- * A #GParamSpec derived structure that contains the meta data for #GType properties.
- * 
- * Since: 2.10
- */
-struct _GParamSpecGType
-{
-  GParamSpec    parent_instance;
-  GType         is_a_type;
-};
-/**
- * GParamSpecVariant:
- * @parent_instance: private #GParamSpec portion
- * @type: a #GVariantType, or %NULL
- * @default_value: a #GVariant, or %NULL
- *
- * A #GParamSpec derived structure that contains the meta data for #GVariant properties.
- *
- * Since: 2.26
- */
-struct _GParamSpecVariant
-{
-  GParamSpec    parent_instance;
-  GVariantType *type;
-  GVariant     *default_value;
-
-  /*< private >*/
-  gpointer      padding[4];
-};
-
-/* --- GParamSpec prototypes --- */
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_char	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint8		  minimum,
-					  gint8		  maximum,
-					  gint8		  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_uchar	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint8	  minimum,
-					  guint8	  maximum,
-					  guint8	  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_boolean	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gboolean	  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_int	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint		  minimum,
-					  gint		  maximum,
-					  gint		  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_uint	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint		  minimum,
-					  guint		  maximum,
-					  guint		  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_long	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  glong		  minimum,
-					  glong		  maximum,
-					  glong		  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_ulong	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gulong	  minimum,
-					  gulong	  maximum,
-					  gulong	  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_int64	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint64       	  minimum,
-					  gint64       	  maximum,
-					  gint64       	  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_uint64	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint64	  minimum,
-					  guint64	  maximum,
-					  guint64	  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_unichar      (const gchar    *name,
-				          const gchar    *nick,
-				          const gchar    *blurb,
-				          gunichar	  default_value,
-				          GParamFlags     flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_enum	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  enum_type,
-					  gint		  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_flags	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  flags_type,
-					  guint		  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_float	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gfloat	  minimum,
-					  gfloat	  maximum,
-					  gfloat	  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_double	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gdouble	  minimum,
-					  gdouble	  maximum,
-					  gdouble	  default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_string	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  const gchar	 *default_value,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_param	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  param_type,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_boxed	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  boxed_type,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_pointer	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_value_array (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GParamSpec	 *element_spec,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_object	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  object_type,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_override    (const gchar    *name,
-					  GParamSpec     *overridden);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_gtype	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType           is_a_type,
-					  GParamFlags	  flags);
-GLIB_AVAILABLE_IN_ALL
-GParamSpec*	g_param_spec_variant	 (const gchar        *name,
-					  const gchar        *nick,
-					  const gchar	     *blurb,
-					  const GVariantType *type,
-					  GVariant           *default_value,
-					  GParamFlags         flags);
-
-/* --- internal --- */
-/* We prefix variable declarations so they can
- * properly get exported in windows dlls.
- */
-#ifndef GOBJECT_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GOBJECT_STATIC_COMPILATION
-#      define GOBJECT_VAR extern
-#    else /* !GOBJECT_STATIC_COMPILATION */
-#      ifdef GOBJECT_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GOBJECT_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GOBJECT_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GOBJECT_COMPILATION */
-#        define GOBJECT_VAR extern __declspec(dllimport)
-#      endif /* !GOBJECT_COMPILATION */
-#    endif /* !GOBJECT_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    define GOBJECT_VAR _GLIB_EXTERN
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GOBJECT_VAR */
-
-GOBJECT_VAR GType *g_param_spec_types;
-
-G_END_DECLS
-
-#endif /* __G_PARAMSPECS_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gsignal.h b/linux-x86/include/glib-2.0/gobject/gsignal.h
deleted file mode 100644
index 46721ca..0000000
--- a/linux-x86/include/glib-2.0/gobject/gsignal.h
+++ /dev/null
@@ -1,585 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __G_SIGNAL_H__
-#define __G_SIGNAL_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include	<gobject/gclosure.h>
-#include	<gobject/gvalue.h>
-#include	<gobject/gparam.h>
-#include	<gobject/gmarshal.h>
-
-G_BEGIN_DECLS
-
-/* --- typedefs --- */
-typedef struct _GSignalQuery		 GSignalQuery;
-typedef struct _GSignalInvocationHint	 GSignalInvocationHint;
-/**
- * GSignalCMarshaller:
- * 
- * This is the signature of marshaller functions, required to marshall
- * arrays of parameter values to signal emissions into C language callback
- * invocations. It is merely an alias to #GClosureMarshal since the #GClosure
- * mechanism takes over responsibility of actual function invocation for the
- * signal system.
- */
-typedef GClosureMarshal			 GSignalCMarshaller;
-/**
- * GSignalCVaMarshaller:
- * 
- * This is the signature of va_list marshaller functions, an optional
- * marshaller that can be used in some situations to avoid
- * marshalling the signal argument into GValues.
- */
-typedef GVaClosureMarshal		 GSignalCVaMarshaller;
-/**
- * GSignalEmissionHook:
- * @ihint: Signal invocation hint, see #GSignalInvocationHint.
- * @n_param_values: the number of parameters to the function, including
- *  the instance on which the signal was emitted.
- * @param_values: (array length=n_param_values): the instance on which
- *  the signal was emitted, followed by the parameters of the emission.
- * @data: user data associated with the hook.
- * 
- * A simple function pointer to get invoked when the signal is emitted. This 
- * allows you to tie a hook to the signal type, so that it will trap all 
- * emissions of that signal, from any object.
- * 
- * You may not attach these to signals created with the #G_SIGNAL_NO_HOOKS flag.
- * 
- * Returns: whether it wants to stay connected. If it returns %FALSE, the signal 
- *  hook is disconnected (and destroyed).
- */
-typedef gboolean (*GSignalEmissionHook) (GSignalInvocationHint *ihint,
-					 guint			n_param_values,
-					 const GValue	       *param_values,
-					 gpointer		data);
-/**
- * GSignalAccumulator:
- * @ihint: Signal invocation hint, see #GSignalInvocationHint.
- * @return_accu: Accumulator to collect callback return values in, this
- *  is the return value of the current signal emission.
- * @handler_return: A #GValue holding the return value of the signal handler.
- * @data: Callback data that was specified when creating the signal.
- * 
- * The signal accumulator is a special callback function that can be used
- * to collect return values of the various callbacks that are called
- * during a signal emission. The signal accumulator is specified at signal
- * creation time, if it is left %NULL, no accumulation of callback return
- * values is performed. The return value of signal emissions is then the
- * value returned by the last callback.
- * 
- * Returns: The accumulator function returns whether the signal emission
- *  should be aborted. Returning %FALSE means to abort the
- *  current emission and %TRUE is returned for continuation.
- */
-typedef gboolean (*GSignalAccumulator)	(GSignalInvocationHint *ihint,
-					 GValue		       *return_accu,
-					 const GValue	       *handler_return,
-					 gpointer               data);
-
-
-/* --- run, match and connect types --- */
-/**
- * GSignalFlags:
- * @G_SIGNAL_RUN_FIRST: Invoke the object method handler in the first emission stage.
- * @G_SIGNAL_RUN_LAST: Invoke the object method handler in the third emission stage.
- * @G_SIGNAL_RUN_CLEANUP: Invoke the object method handler in the last emission stage.
- * @G_SIGNAL_NO_RECURSE: Signals being emitted for an object while currently being in
- *  emission for this very object will not be emitted recursively,
- *  but instead cause the first emission to be restarted.
- * @G_SIGNAL_DETAILED: This signal supports "::detail" appendices to the signal name
- *  upon handler connections and emissions.
- * @G_SIGNAL_ACTION: Action signals are signals that may freely be emitted on alive
- *  objects from user code via g_signal_emit() and friends, without
- *  the need of being embedded into extra code that performs pre or
- *  post emission adjustments on the object. They can also be thought
- *  of as object methods which can be called generically by 
- *  third-party code.
- * @G_SIGNAL_NO_HOOKS: No emissions hooks are supported for this signal.
- * @G_SIGNAL_MUST_COLLECT: Varargs signal emission will always collect the
- *   arguments, even if there are no signal handlers connected.  Since 2.30.
- * @G_SIGNAL_DEPRECATED: The signal is deprecated and will be removed
- *   in a future version. A warning will be generated if it is connected while
- *   running with G_ENABLE_DIAGNOSTIC=1.  Since 2.32.
- * 
- * The signal flags are used to specify a signal's behaviour, the overall
- * signal description outlines how especially the RUN flags control the
- * stages of a signal emission.
- */
-typedef enum
-{
-  G_SIGNAL_RUN_FIRST	= 1 << 0,
-  G_SIGNAL_RUN_LAST	= 1 << 1,
-  G_SIGNAL_RUN_CLEANUP	= 1 << 2,
-  G_SIGNAL_NO_RECURSE	= 1 << 3,
-  G_SIGNAL_DETAILED	= 1 << 4,
-  G_SIGNAL_ACTION	= 1 << 5,
-  G_SIGNAL_NO_HOOKS	= 1 << 6,
-  G_SIGNAL_MUST_COLLECT = 1 << 7,
-  G_SIGNAL_DEPRECATED   = 1 << 8
-} GSignalFlags;
-/**
- * G_SIGNAL_FLAGS_MASK:
- * 
- * A mask for all #GSignalFlags bits.
- */
-#define G_SIGNAL_FLAGS_MASK  0x1ff
-/**
- * GConnectFlags:
- * @G_CONNECT_AFTER: whether the handler should be called before or after the 
- *  default handler of the signal.
- * @G_CONNECT_SWAPPED: whether the instance and data should be swapped when
- *  calling the handler.
- * 
- * The connection flags are used to specify the behaviour of a signal's 
- * connection.
- */
-typedef enum
-{
-  G_CONNECT_AFTER	= 1 << 0,
-  G_CONNECT_SWAPPED	= 1 << 1
-} GConnectFlags;
-/**
- * GSignalMatchType:
- * @G_SIGNAL_MATCH_ID: The signal id must be equal.
- * @G_SIGNAL_MATCH_DETAIL: The signal detail be equal.
- * @G_SIGNAL_MATCH_CLOSURE: The closure must be the same.
- * @G_SIGNAL_MATCH_FUNC: The C closure callback must be the same.
- * @G_SIGNAL_MATCH_DATA: The closure data must be the same.
- * @G_SIGNAL_MATCH_UNBLOCKED: Only unblocked signals may matched.
- * 
- * The match types specify what g_signal_handlers_block_matched(),
- * g_signal_handlers_unblock_matched() and g_signal_handlers_disconnect_matched()
- * match signals by.
- */
-typedef enum
-{
-  G_SIGNAL_MATCH_ID	   = 1 << 0,
-  G_SIGNAL_MATCH_DETAIL	   = 1 << 1,
-  G_SIGNAL_MATCH_CLOSURE   = 1 << 2,
-  G_SIGNAL_MATCH_FUNC	   = 1 << 3,
-  G_SIGNAL_MATCH_DATA	   = 1 << 4,
-  G_SIGNAL_MATCH_UNBLOCKED = 1 << 5
-} GSignalMatchType;
-/**
- * G_SIGNAL_MATCH_MASK:
- * 
- * A mask for all #GSignalMatchType bits.
- */
-#define G_SIGNAL_MATCH_MASK  0x3f
-/**
- * G_SIGNAL_TYPE_STATIC_SCOPE:
- * 
- * This macro flags signal argument types for which the signal system may 
- * assume that instances thereof remain persistent across all signal emissions
- * they are used in. This is only useful for non ref-counted, value-copy types.
- * 
- * To flag a signal argument in this way, add 
- * <literal>| G_SIGNAL_TYPE_STATIC_SCOPE</literal> to the corresponding argument
- * of g_signal_new().
- * |[
- * g_signal_new ("size_request",
- *   G_TYPE_FROM_CLASS (gobject_class),
- * 	 G_SIGNAL_RUN_FIRST,
- * 	 G_STRUCT_OFFSET (GtkWidgetClass, size_request),
- * 	 NULL, NULL,
- * 	 _gtk_marshal_VOID__BOXED,
- * 	 G_TYPE_NONE, 1,
- * 	 GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE);
- * ]|
- */
-#define	G_SIGNAL_TYPE_STATIC_SCOPE (G_TYPE_FLAG_RESERVED_ID_BIT)
-
-
-/* --- signal information --- */
-/**
- * GSignalInvocationHint:
- * @signal_id: The signal id of the signal invoking the callback
- * @detail: The detail passed on for this emission
- * @run_type: The stage the signal emission is currently in, this
- *  field will contain one of %G_SIGNAL_RUN_FIRST,
- *  %G_SIGNAL_RUN_LAST or %G_SIGNAL_RUN_CLEANUP.
- * 
- * The #GSignalInvocationHint structure is used to pass on additional information
- * to callbacks during a signal emission.
- */
-struct _GSignalInvocationHint
-{
-  guint		signal_id;
-  GQuark	detail;
-  GSignalFlags	run_type;
-};
-/**
- * GSignalQuery:
- * @signal_id: The signal id of the signal being queried, or 0 if the
- *  signal to be queried was unknown.
- * @signal_name: The signal name.
- * @itype: The interface/instance type that this signal can be emitted for.
- * @signal_flags: The signal flags as passed in to g_signal_new().
- * @return_type: The return type for user callbacks.
- * @n_params: The number of parameters that user callbacks take.
- * @param_types: (array length=n_params): The individual parameter types for
- *  user callbacks, note that the effective callback signature is:
- *  <programlisting>
- *  @return_type callback (#gpointer     data1,
- *  [param_types param_names,]
- *  gpointer     data2);
- *  </programlisting>
- * 
- * A structure holding in-depth information for a specific signal. It is
- * filled in by the g_signal_query() function.
- */
-struct _GSignalQuery
-{
-  guint		signal_id;
-  const gchar  *signal_name;
-  GType		itype;
-  GSignalFlags	signal_flags;
-  GType		return_type; /* mangled with G_SIGNAL_TYPE_STATIC_SCOPE flag */
-  guint		n_params;
-  const GType  *param_types; /* mangled with G_SIGNAL_TYPE_STATIC_SCOPE flag */
-};
-
-
-/* --- signals --- */
-GLIB_AVAILABLE_IN_ALL
-guint                 g_signal_newv         (const gchar        *signal_name,
-					     GType               itype,
-					     GSignalFlags        signal_flags,
-					     GClosure           *class_closure,
-					     GSignalAccumulator	 accumulator,
-					     gpointer		 accu_data,
-					     GSignalCMarshaller  c_marshaller,
-					     GType               return_type,
-					     guint               n_params,
-					     GType              *param_types);
-GLIB_AVAILABLE_IN_ALL
-guint                 g_signal_new_valist   (const gchar        *signal_name,
-					     GType               itype,
-					     GSignalFlags        signal_flags,
-					     GClosure           *class_closure,
-					     GSignalAccumulator	 accumulator,
-					     gpointer		 accu_data,
-					     GSignalCMarshaller  c_marshaller,
-					     GType               return_type,
-					     guint               n_params,
-					     va_list             args);
-GLIB_AVAILABLE_IN_ALL
-guint                 g_signal_new          (const gchar        *signal_name,
-					     GType               itype,
-					     GSignalFlags        signal_flags,
-					     guint               class_offset,
-					     GSignalAccumulator	 accumulator,
-					     gpointer		 accu_data,
-					     GSignalCMarshaller  c_marshaller,
-					     GType               return_type,
-					     guint               n_params,
-					     ...);
-GLIB_AVAILABLE_IN_ALL
-guint            g_signal_new_class_handler (const gchar        *signal_name,
-                                             GType               itype,
-                                             GSignalFlags        signal_flags,
-                                             GCallback           class_handler,
-                                             GSignalAccumulator  accumulator,
-                                             gpointer            accu_data,
-                                             GSignalCMarshaller  c_marshaller,
-                                             GType               return_type,
-                                             guint               n_params,
-                                             ...);
-GLIB_AVAILABLE_IN_ALL
-void             g_signal_set_va_marshaller (guint              signal_id,
-					     GType              instance_type,
-					     GSignalCVaMarshaller va_marshaller);
-
-GLIB_AVAILABLE_IN_ALL
-void                  g_signal_emitv        (const GValue       *instance_and_params,
-					     guint               signal_id,
-					     GQuark              detail,
-					     GValue             *return_value);
-GLIB_AVAILABLE_IN_ALL
-void                  g_signal_emit_valist  (gpointer            instance,
-					     guint               signal_id,
-					     GQuark              detail,
-					     va_list             var_args);
-GLIB_AVAILABLE_IN_ALL
-void                  g_signal_emit         (gpointer            instance,
-					     guint               signal_id,
-					     GQuark              detail,
-					     ...);
-GLIB_AVAILABLE_IN_ALL
-void                  g_signal_emit_by_name (gpointer            instance,
-					     const gchar        *detailed_signal,
-					     ...);
-GLIB_AVAILABLE_IN_ALL
-guint                 g_signal_lookup       (const gchar        *name,
-					     GType               itype);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_signal_name         (guint               signal_id);
-GLIB_AVAILABLE_IN_ALL
-void                  g_signal_query        (guint               signal_id,
-					     GSignalQuery       *query);
-GLIB_AVAILABLE_IN_ALL
-guint*                g_signal_list_ids     (GType               itype,
-					     guint              *n_ids);
-GLIB_AVAILABLE_IN_ALL
-gboolean	      g_signal_parse_name   (const gchar	*detailed_signal,
-					     GType		 itype,
-					     guint		*signal_id_p,
-					     GQuark		*detail_p,
-					     gboolean		 force_detail_quark);
-GLIB_AVAILABLE_IN_ALL
-GSignalInvocationHint* g_signal_get_invocation_hint (gpointer    instance);
-
-
-/* --- signal emissions --- */
-GLIB_AVAILABLE_IN_ALL
-void	g_signal_stop_emission		    (gpointer		  instance,
-					     guint		  signal_id,
-					     GQuark		  detail);
-GLIB_AVAILABLE_IN_ALL
-void	g_signal_stop_emission_by_name	    (gpointer		  instance,
-					     const gchar	 *detailed_signal);
-GLIB_AVAILABLE_IN_ALL
-gulong	g_signal_add_emission_hook	    (guint		  signal_id,
-					     GQuark		  detail,
-					     GSignalEmissionHook  hook_func,
-					     gpointer	       	  hook_data,
-					     GDestroyNotify	  data_destroy);
-GLIB_AVAILABLE_IN_ALL
-void	g_signal_remove_emission_hook	    (guint		  signal_id,
-					     gulong		  hook_id);
-
-
-/* --- signal handlers --- */
-GLIB_AVAILABLE_IN_ALL
-gboolean g_signal_has_handler_pending	      (gpointer		  instance,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       gboolean		  may_be_blocked);
-GLIB_AVAILABLE_IN_ALL
-gulong	 g_signal_connect_closure_by_id	      (gpointer		  instance,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gboolean		  after);
-GLIB_AVAILABLE_IN_ALL
-gulong	 g_signal_connect_closure	      (gpointer		  instance,
-					       const gchar       *detailed_signal,
-					       GClosure		 *closure,
-					       gboolean		  after);
-GLIB_AVAILABLE_IN_ALL
-gulong	 g_signal_connect_data		      (gpointer		  instance,
-					       const gchar	 *detailed_signal,
-					       GCallback	  c_handler,
-					       gpointer		  data,
-					       GClosureNotify	  destroy_data,
-					       GConnectFlags	  connect_flags);
-GLIB_AVAILABLE_IN_ALL
-void	 g_signal_handler_block		      (gpointer		  instance,
-					       gulong		  handler_id);
-GLIB_AVAILABLE_IN_ALL
-void	 g_signal_handler_unblock	      (gpointer		  instance,
-					       gulong		  handler_id);
-GLIB_AVAILABLE_IN_ALL
-void	 g_signal_handler_disconnect	      (gpointer		  instance,
-					       gulong		  handler_id);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_signal_handler_is_connected	      (gpointer		  instance,
-					       gulong		  handler_id);
-GLIB_AVAILABLE_IN_ALL
-gulong	 g_signal_handler_find		      (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-GLIB_AVAILABLE_IN_ALL
-guint	 g_signal_handlers_block_matched      (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-GLIB_AVAILABLE_IN_ALL
-guint	 g_signal_handlers_unblock_matched    (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-GLIB_AVAILABLE_IN_ALL
-guint	 g_signal_handlers_disconnect_matched (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-
-
-/* --- overriding and chaining --- */
-GLIB_AVAILABLE_IN_ALL
-void    g_signal_override_class_closure       (guint              signal_id,
-                                               GType              instance_type,
-                                               GClosure          *class_closure);
-GLIB_AVAILABLE_IN_ALL
-void    g_signal_override_class_handler       (const gchar       *signal_name,
-                                               GType              instance_type,
-                                               GCallback          class_handler);
-GLIB_AVAILABLE_IN_ALL
-void    g_signal_chain_from_overridden        (const GValue      *instance_and_params,
-                                               GValue            *return_value);
-GLIB_AVAILABLE_IN_ALL
-void   g_signal_chain_from_overridden_handler (gpointer           instance,
-                                               ...);
-
-
-/* --- convenience --- */
-/**
- * g_signal_connect:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @c_handler: the #GCallback to connect.
- * @data: data to pass to @c_handler calls.
- * 
- * Connects a #GCallback function to a signal for a particular object.
- * 
- * The handler will be called before the default handler of the signal.
- * 
- * Returns: the handler id
- */
-#define g_signal_connect(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, (GConnectFlags) 0)
-/**
- * g_signal_connect_after:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @c_handler: the #GCallback to connect.
- * @data: data to pass to @c_handler calls.
- * 
- * Connects a #GCallback function to a signal for a particular object.
- * 
- * The handler will be called after the default handler of the signal.
- * 
- * Returns: the handler id
- */
-#define g_signal_connect_after(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_AFTER)
-/**
- * g_signal_connect_swapped:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @c_handler: the #GCallback to connect.
- * @data: data to pass to @c_handler calls.
- * 
- * Connects a #GCallback function to a signal for a particular object.
- * 
- * The instance on which the signal is emitted and @data will be swapped when 
- * calling the handler.
- * 
- * Returns: the handler id
- */
-#define g_signal_connect_swapped(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_SWAPPED)
-/**
- * g_signal_handlers_disconnect_by_func:
- * @instance: The instance to remove handlers from.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- * 
- * Disconnects all handlers on an instance that match @func and @data.
- * 
- * Returns: The number of handlers that matched.
- */
-#define	g_signal_handlers_disconnect_by_func(instance, func, data)						\
-    g_signal_handlers_disconnect_matched ((instance),								\
-					  (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA),	\
-					  0, 0, NULL, (func), (data))
-
-/**
- * g_signal_handlers_disconnect_by_data:
- * @instance: The instance to remove handlers from
- * @data: the closure data of the handlers' closures
- *
- * Disconnects all handlers on an instance that match @data.
- *
- * Returns: The number of handlers that matched.
- *
- * Since: 2.32
- */
-#define g_signal_handlers_disconnect_by_data(instance, data) \
-  g_signal_handlers_disconnect_matched ((instance), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, (data))
-
-/**
- * g_signal_handlers_block_by_func:
- * @instance: The instance to block handlers from.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- * 
- * Blocks all handlers on an instance that match @func and @data.
- * 
- * Returns: The number of handlers that matched.
- */
-#define	g_signal_handlers_block_by_func(instance, func, data)							\
-    g_signal_handlers_block_matched      ((instance),								\
-				          (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA),	\
-				          0, 0, NULL, (func), (data))
-/**
- * g_signal_handlers_unblock_by_func:
- * @instance: The instance to unblock handlers from.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- * 
- * Unblocks all handlers on an instance that match @func and @data.
- * 
- * Returns: The number of handlers that matched.
- */
-#define	g_signal_handlers_unblock_by_func(instance, func, data)							\
-    g_signal_handlers_unblock_matched    ((instance),								\
-				          (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA),	\
-				          0, 0, NULL, (func), (data))
-
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_signal_accumulator_true_handled (GSignalInvocationHint *ihint,
-					    GValue                *return_accu,
-					    const GValue          *handler_return,
-					    gpointer               dummy);
-
-GLIB_AVAILABLE_IN_ALL
-gboolean g_signal_accumulator_first_wins   (GSignalInvocationHint *ihint,
-                                            GValue                *return_accu,
-                                            const GValue          *handler_return,
-                                            gpointer               dummy);
-
-/*< private >*/
-GLIB_AVAILABLE_IN_ALL
-void	 g_signal_handlers_destroy	      (gpointer		  instance);
-void	 _g_signals_destroy		      (GType		  itype);
-
-G_END_DECLS
-
-#endif /* __G_SIGNAL_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gsourceclosure.h b/linux-x86/include/glib-2.0/gobject/gsourceclosure.h
deleted file mode 100644
index 6f07786..0000000
--- a/linux-x86/include/glib-2.0/gobject/gsourceclosure.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __G_SOURCECLOSURE_H__
-#define __G_SOURCECLOSURE_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include <gobject/gclosure.h>
-#include <gobject/glib-types.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_ALL
-void g_source_set_closure        (GSource  *source,
-				  GClosure *closure);
-
-GLIB_AVAILABLE_IN_ALL
-void g_source_set_dummy_callback (GSource  *source);
-
-G_END_DECLS
-
-#endif /* __G_SOURCECLOSURE_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gtype.h b/linux-x86/include/glib-2.0/gobject/gtype.h
deleted file mode 100644
index ff57af7..0000000
--- a/linux-x86/include/glib-2.0/gobject/gtype.h
+++ /dev/null
@@ -1,1977 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __G_TYPE_H__
-#define __G_TYPE_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include        <glib.h>
-
-G_BEGIN_DECLS
-
-/* Basic Type Macros
- */
-/**
- * G_TYPE_FUNDAMENTAL:
- * @type: A #GType value.
- * 
- * The fundamental type which is the ancestor of @type.
- * Fundamental types are types that serve as ultimate bases for the derived types, 
- * thus they are the roots of distinct inheritance hierarchies.
- */
-#define G_TYPE_FUNDAMENTAL(type)	(g_type_fundamental (type))
-/**
- * G_TYPE_FUNDAMENTAL_MAX:
- * 
- * An integer constant that represents the number of identifiers reserved
- * for types that are assigned at compile-time.
- */
-#define	G_TYPE_FUNDAMENTAL_MAX		(255 << G_TYPE_FUNDAMENTAL_SHIFT)
-
-/* Constant fundamental types,
- */
-/**
- * G_TYPE_INVALID:
- * 
- * An invalid #GType used as error return value in some functions which return
- * a #GType. 
- */
-#define G_TYPE_INVALID			G_TYPE_MAKE_FUNDAMENTAL (0)
-/**
- * G_TYPE_NONE:
- * 
- * A fundamental type which is used as a replacement for the C
- * <literal>void</literal> return type.
- */
-#define G_TYPE_NONE			G_TYPE_MAKE_FUNDAMENTAL (1)
-/**
- * G_TYPE_INTERFACE:
- * 
- * The fundamental type from which all interfaces are derived.
- */
-#define G_TYPE_INTERFACE		G_TYPE_MAKE_FUNDAMENTAL (2)
-/**
- * G_TYPE_CHAR:
- * 
- * The fundamental type corresponding to #gchar.
- * The type designated by G_TYPE_CHAR is unconditionally an 8-bit signed integer.
- * This may or may not be the same type a the C type "gchar".
- */
-#define G_TYPE_CHAR			G_TYPE_MAKE_FUNDAMENTAL (3)
-/**
- * G_TYPE_UCHAR:
- * 
- * The fundamental type corresponding to #guchar.
- */
-#define G_TYPE_UCHAR			G_TYPE_MAKE_FUNDAMENTAL (4)
-/**
- * G_TYPE_BOOLEAN:
- * 
- * The fundamental type corresponding to #gboolean.
- */
-#define G_TYPE_BOOLEAN			G_TYPE_MAKE_FUNDAMENTAL (5)
-/**
- * G_TYPE_INT:
- * 
- * The fundamental type corresponding to #gint.
- */
-#define G_TYPE_INT			G_TYPE_MAKE_FUNDAMENTAL (6)
-/**
- * G_TYPE_UINT:
- * 
- * The fundamental type corresponding to #guint.
- */
-#define G_TYPE_UINT			G_TYPE_MAKE_FUNDAMENTAL (7)
-/**
- * G_TYPE_LONG:
- * 
- * The fundamental type corresponding to #glong.
- */
-#define G_TYPE_LONG			G_TYPE_MAKE_FUNDAMENTAL (8)
-/**
- * G_TYPE_ULONG:
- * 
- * The fundamental type corresponding to #gulong.
- */
-#define G_TYPE_ULONG			G_TYPE_MAKE_FUNDAMENTAL (9)
-/**
- * G_TYPE_INT64:
- * 
- * The fundamental type corresponding to #gint64.
- */
-#define G_TYPE_INT64			G_TYPE_MAKE_FUNDAMENTAL (10)
-/**
- * G_TYPE_UINT64:
- * 
- * The fundamental type corresponding to #guint64.
- */
-#define G_TYPE_UINT64			G_TYPE_MAKE_FUNDAMENTAL (11)
-/**
- * G_TYPE_ENUM:
- * 
- * The fundamental type from which all enumeration types are derived.
- */
-#define G_TYPE_ENUM			G_TYPE_MAKE_FUNDAMENTAL (12)
-/**
- * G_TYPE_FLAGS:
- * 
- * The fundamental type from which all flags types are derived.
- */
-#define G_TYPE_FLAGS			G_TYPE_MAKE_FUNDAMENTAL (13)
-/**
- * G_TYPE_FLOAT:
- * 
- * The fundamental type corresponding to #gfloat.
- */
-#define G_TYPE_FLOAT			G_TYPE_MAKE_FUNDAMENTAL (14)
-/**
- * G_TYPE_DOUBLE:
- * 
- * The fundamental type corresponding to #gdouble.
- */
-#define G_TYPE_DOUBLE			G_TYPE_MAKE_FUNDAMENTAL (15)
-/**
- * G_TYPE_STRING:
- * 
- * The fundamental type corresponding to nul-terminated C strings.
- */
-#define G_TYPE_STRING			G_TYPE_MAKE_FUNDAMENTAL (16)
-/**
- * G_TYPE_POINTER:
- * 
- * The fundamental type corresponding to #gpointer.
- */
-#define G_TYPE_POINTER			G_TYPE_MAKE_FUNDAMENTAL (17)
-/**
- * G_TYPE_BOXED:
- * 
- * The fundamental type from which all boxed types are derived.
- */
-#define G_TYPE_BOXED			G_TYPE_MAKE_FUNDAMENTAL (18)
-/**
- * G_TYPE_PARAM:
- * 
- * The fundamental type from which all #GParamSpec types are derived.
- */
-#define G_TYPE_PARAM			G_TYPE_MAKE_FUNDAMENTAL (19)
-/**
- * G_TYPE_OBJECT:
- * 
- * The fundamental type for #GObject.
- */
-#define G_TYPE_OBJECT			G_TYPE_MAKE_FUNDAMENTAL (20)
-/**
- * G_TYPE_VARIANT:
- *
- * The fundamental type corresponding to #GVariant.
- *
- * All floating #GVariant instances passed through the #GType system are
- * consumed.
- * 
- * Note that callbacks in closures, and signal handlers
- * for signals of return type %G_TYPE_VARIANT, must never return floating
- * variants.
- *
- * Note: GLib 2.24 did include a boxed type with this name. It was replaced
- * with this fundamental type in 2.26.
- *
- * Since: 2.26
- */
-#define	G_TYPE_VARIANT                  G_TYPE_MAKE_FUNDAMENTAL (21)
-
-
-/* Reserved fundamental type numbers to create new fundamental
- * type IDs with G_TYPE_MAKE_FUNDAMENTAL().
- * Send email to gtk-devel-list@gnome.org for reservations.
- */
-/**
- * G_TYPE_FUNDAMENTAL_SHIFT:
- *
- * Shift value used in converting numbers to type IDs.
- */
-#define	G_TYPE_FUNDAMENTAL_SHIFT	(2)
-/**
- * G_TYPE_MAKE_FUNDAMENTAL:
- * @x: the fundamental type number.
- * 
- * Get the type ID for the fundamental type number @x.
- * Use g_type_fundamental_next() instead of this macro to create new fundamental 
- * types.
- *
- * Returns: the GType
- */
-#define	G_TYPE_MAKE_FUNDAMENTAL(x)	((GType) ((x) << G_TYPE_FUNDAMENTAL_SHIFT))
-/**
- * G_TYPE_RESERVED_GLIB_FIRST:
- * 
- * First fundamental type number to create a new fundamental type id with
- * G_TYPE_MAKE_FUNDAMENTAL() reserved for GLib.
- */
-#define G_TYPE_RESERVED_GLIB_FIRST	(22)
-/**
- * G_TYPE_RESERVED_GLIB_LAST:
- * 
- * Last fundamental type number reserved for GLib.
- */
-#define G_TYPE_RESERVED_GLIB_LAST	(31)
-/**
- * G_TYPE_RESERVED_BSE_FIRST:
- * 
- * First fundamental type number to create a new fundamental type id with
- * G_TYPE_MAKE_FUNDAMENTAL() reserved for BSE.
- */
-#define G_TYPE_RESERVED_BSE_FIRST	(32)
-/**
- * G_TYPE_RESERVED_BSE_LAST:
- * 
- * Last fundamental type number reserved for BSE.
- */
-#define G_TYPE_RESERVED_BSE_LAST	(48)
-/**
- * G_TYPE_RESERVED_USER_FIRST:
- * 
- * First available fundamental type number to create new fundamental 
- * type id with G_TYPE_MAKE_FUNDAMENTAL().
- */
-#define G_TYPE_RESERVED_USER_FIRST	(49)
-
-
-/* Type Checking Macros
- */
-/**
- * G_TYPE_IS_FUNDAMENTAL:
- * @type: A #GType value.
- * 
- * Checks if @type is a fundamental type.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_FUNDAMENTAL(type)             ((type) <= G_TYPE_FUNDAMENTAL_MAX)
-/**
- * G_TYPE_IS_DERIVED:
- * @type: A #GType value.
- * 
- * Checks if @type is derived (or in object-oriented terminology:
- * inherited) from another type (this holds true for all non-fundamental
- * types).
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_DERIVED(type)                 ((type) > G_TYPE_FUNDAMENTAL_MAX)
-/**
- * G_TYPE_IS_INTERFACE:
- * @type: A #GType value.
- * 
- * Checks if @type is an interface type.
- * An interface type provides a pure API, the implementation
- * of which is provided by another type (which is then said to conform
- * to the interface).  GLib interfaces are somewhat analogous to Java
- * interfaces and C++ classes containing only pure virtual functions, 
- * with the difference that GType interfaces are not derivable (but see
- * g_type_interface_add_prerequisite() for an alternative).
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_INTERFACE(type)               (G_TYPE_FUNDAMENTAL (type) == G_TYPE_INTERFACE)
-/**
- * G_TYPE_IS_CLASSED:
- * @type: A #GType value.
- * 
- * Checks if @type is a classed type.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_CLASSED(type)                 (g_type_test_flags ((type), G_TYPE_FLAG_CLASSED))
-/**
- * G_TYPE_IS_INSTANTIATABLE:
- * @type: A #GType value.
- * 
- * Checks if @type can be instantiated.  Instantiation is the
- * process of creating an instance (object) of this type.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_INSTANTIATABLE(type)          (g_type_test_flags ((type), G_TYPE_FLAG_INSTANTIATABLE))
-/**
- * G_TYPE_IS_DERIVABLE:
- * @type: A #GType value.
- * 
- * Checks if @type is a derivable type.  A derivable type can
- * be used as the base class of a flat (single-level) class hierarchy.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_DERIVABLE(type)               (g_type_test_flags ((type), G_TYPE_FLAG_DERIVABLE))
-/**
- * G_TYPE_IS_DEEP_DERIVABLE:
- * @type: A #GType value.
- * 
- * Checks if @type is a deep derivable type.  A deep derivable type
- * can be used as the base class of a deep (multi-level) class hierarchy.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_DEEP_DERIVABLE(type)          (g_type_test_flags ((type), G_TYPE_FLAG_DEEP_DERIVABLE))
-/**
- * G_TYPE_IS_ABSTRACT:
- * @type: A #GType value.
- * 
- * Checks if @type is an abstract type.  An abstract type cannot be
- * instantiated and is normally used as an abstract base class for
- * derived classes.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_ABSTRACT(type)                (g_type_test_flags ((type), G_TYPE_FLAG_ABSTRACT))
-/**
- * G_TYPE_IS_VALUE_ABSTRACT:
- * @type: A #GType value.
- * 
- * Checks if @type is an abstract value type.  An abstract value type introduces
- * a value table, but can't be used for g_value_init() and is normally used as
- * an abstract base type for derived value types.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_VALUE_ABSTRACT(type)          (g_type_test_flags ((type), G_TYPE_FLAG_VALUE_ABSTRACT))
-/**
- * G_TYPE_IS_VALUE_TYPE:
- * @type: A #GType value.
- * 
- * Checks if @type is a value type and can be used with g_value_init(). 
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_VALUE_TYPE(type)              (g_type_check_is_value_type (type))
-/**
- * G_TYPE_HAS_VALUE_TABLE:
- * @type: A #GType value.
- * 
- * Checks if @type has a #GTypeValueTable.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_HAS_VALUE_TABLE(type)            (g_type_value_table_peek (type) != NULL)
-
-
-/* Typedefs
- */
-/**
- * GType:
- * 
- * A numerical value which represents the unique identifier of a registered
- * type.
- */
-#if     GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined __cplusplus
-typedef gsize                           GType;
-#else   /* for historic reasons, C++ links against gulong GTypes */
-typedef gulong                          GType;
-#endif
-typedef struct _GValue                  GValue;
-typedef union  _GTypeCValue             GTypeCValue;
-typedef struct _GTypePlugin             GTypePlugin;
-typedef struct _GTypeClass              GTypeClass;
-typedef struct _GTypeInterface          GTypeInterface;
-typedef struct _GTypeInstance           GTypeInstance;
-typedef struct _GTypeInfo               GTypeInfo;
-typedef struct _GTypeFundamentalInfo    GTypeFundamentalInfo;
-typedef struct _GInterfaceInfo          GInterfaceInfo;
-typedef struct _GTypeValueTable         GTypeValueTable;
-typedef struct _GTypeQuery		GTypeQuery;
-
-
-/* Basic Type Structures
- */
-/**
- * GTypeClass:
- * 
- * An opaque structure used as the base of all classes.
- */
-struct _GTypeClass
-{
-  /*< private >*/
-  GType g_type;
-};
-/**
- * GTypeInstance:
- * 
- * An opaque structure used as the base of all type instances.
- */
-struct _GTypeInstance
-{
-  /*< private >*/
-  GTypeClass *g_class;
-};
-/**
- * GTypeInterface:
- * 
- * An opaque structure used as the base of all interface types.
- */
-struct _GTypeInterface
-{
-  /*< private >*/
-  GType g_type;         /* iface type */
-  GType g_instance_type;
-};
-/**
- * GTypeQuery:
- * @type: the #GType value of the type.
- * @type_name: the name of the type.
- * @class_size: the size of the class structure.
- * @instance_size: the size of the instance structure.
- * 
- * A structure holding information for a specific type. It is
- * filled in by the g_type_query() function.
- */
-struct _GTypeQuery
-{
-  GType		type;
-  const gchar  *type_name;
-  guint		class_size;
-  guint		instance_size;
-};
-
-
-/* Casts, checks and accessors for structured types
- * usage of these macros is reserved to type implementations only
- */
-/*< protected >*/
-/**
- * G_TYPE_CHECK_INSTANCE:
- * @instance: Location of a #GTypeInstance structure.
- * 
- * Checks if @instance is a valid #GTypeInstance structure,
- * otherwise issues a warning and returns %FALSE.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_INSTANCE(instance)				(_G_TYPE_CHI ((GTypeInstance*) (instance)))
-/**
- * G_TYPE_CHECK_INSTANCE_CAST:
- * @instance: Location of a #GTypeInstance structure.
- * @g_type: The type to be returned.
- * @c_type: The corresponding C type of @g_type.
- * 
- * Checks that @instance is an instance of the type identified by @g_type
- * and issues a warning if this is not the case. Returns @instance casted 
- * to a pointer to @c_type.
- * 
- * This macro should only be used in type implementations.
- */
-#define G_TYPE_CHECK_INSTANCE_CAST(instance, g_type, c_type)    (_G_TYPE_CIC ((instance), (g_type), c_type))
-/**
- * G_TYPE_CHECK_INSTANCE_TYPE:
- * @instance: Location of a #GTypeInstance structure.
- * @g_type: The type to be checked
- * 
- * Checks if @instance is an instance of the type identified by @g_type.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_INSTANCE_TYPE(instance, g_type)            (_G_TYPE_CIT ((instance), (g_type)))
-/**
- * G_TYPE_INSTANCE_GET_CLASS:
- * @instance: Location of the #GTypeInstance structure.
- * @g_type: The #GType of the class to be returned.
- * @c_type: The C type of the class structure.
- * 
- * Get the class structure of a given @instance, casted
- * to a specified ancestor type @g_type of the instance.
- * 
- * Note that while calling a GInstanceInitFunc(), the class pointer gets
- * modified, so it might not always return the expected pointer.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: a pointer to the class structure
- */
-#define G_TYPE_INSTANCE_GET_CLASS(instance, g_type, c_type)     (_G_TYPE_IGC ((instance), (g_type), c_type))
-/**
- * G_TYPE_INSTANCE_GET_INTERFACE:
- * @instance: Location of the #GTypeInstance structure.
- * @g_type: The #GType of the interface to be returned.
- * @c_type: The C type of the interface structure.
- * 
- * Get the interface structure for interface @g_type of a given @instance.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: a pointer to the interface structure
- */
-#define G_TYPE_INSTANCE_GET_INTERFACE(instance, g_type, c_type) (_G_TYPE_IGI ((instance), (g_type), c_type))
-/**
- * G_TYPE_CHECK_CLASS_CAST:
- * @g_class: Location of a #GTypeClass structure.
- * @g_type: The type to be returned.
- * @c_type: The corresponding C type of class structure of @g_type.
- * 
- * Checks that @g_class is a class structure of the type identified by @g_type
- * and issues a warning if this is not the case. Returns @g_class casted 
- * to a pointer to @c_type.
- * 
- * This macro should only be used in type implementations.
- */
-#define G_TYPE_CHECK_CLASS_CAST(g_class, g_type, c_type)        (_G_TYPE_CCC ((g_class), (g_type), c_type))
-/**
- * G_TYPE_CHECK_CLASS_TYPE:
- * @g_class: Location of a #GTypeClass structure.
- * @g_type: The type to be checked.
- * 
- * Checks if @g_class is a class structure of the type identified by 
- * @g_type.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_CLASS_TYPE(g_class, g_type)                (_G_TYPE_CCT ((g_class), (g_type)))
-/**
- * G_TYPE_CHECK_VALUE:
- * @value: a #GValue
- * 
- * Checks if @value has been initialized to hold values
- * of a value type.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_VALUE(value)				(_G_TYPE_CHV ((value)))
-/**
- * G_TYPE_CHECK_VALUE_TYPE:
- * @value: a #GValue
- * @g_type: The type to be checked.
- * 
- * Checks if @value has been initialized to hold values
- * of type @g_type. 
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_VALUE_TYPE(value, g_type)			(_G_TYPE_CVH ((value), (g_type)))
-/**
- * G_TYPE_FROM_INSTANCE:
- * @instance: Location of a valid #GTypeInstance structure.
- * 
- * Get the type identifier from a given @instance structure. 
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: the #GType
- */
-#define G_TYPE_FROM_INSTANCE(instance)                          (G_TYPE_FROM_CLASS (((GTypeInstance*) (instance))->g_class))
-/**
- * G_TYPE_FROM_CLASS:
- * @g_class: Location of a valid #GTypeClass structure.
- * 
- * Get the type identifier from a given @class structure.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: the #GType
- */
-#define G_TYPE_FROM_CLASS(g_class)                              (((GTypeClass*) (g_class))->g_type)
-/**
- * G_TYPE_FROM_INTERFACE:
- * @g_iface: Location of a valid #GTypeInterface structure.
- * 
- * Get the type identifier from a given @interface structure.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: the #GType
- */
-#define G_TYPE_FROM_INTERFACE(g_iface)                          (((GTypeInterface*) (g_iface))->g_type)
-
-/**
- * G_TYPE_INSTANCE_GET_PRIVATE:
- * @instance: the instance of a type deriving from @private_type.
- * @g_type: the type identifying which private data to retrieve.
- * @c_type: The C type for the private structure.
- * 
- * Gets the private structure for a particular type.
- * The private structure must have been registered in the
- * class_init function with g_type_class_add_private().
- * 
- * This macro should only be used in type implementations.
- * 
- * Since: 2.4
- * Returns: a pointer to the private data structure.
- */
-#define G_TYPE_INSTANCE_GET_PRIVATE(instance, g_type, c_type)   ((c_type*) g_type_instance_get_private ((GTypeInstance*) (instance), (g_type)))
-
-/**
- * G_TYPE_CLASS_GET_PRIVATE:
- * @klass: the class of a type deriving from @private_type.
- * @g_type: the type identifying which private data to retrieve.
- * @c_type: The C type for the private structure.
- * 
- * Gets the private class structure for a particular type.
- * The private structure must have been registered in the
- * get_type() function with g_type_add_class_private().
- * 
- * This macro should only be used in type implementations.
- * 
- * Since: 2.24
- * Returns: a pointer to the private data structure.
- */
-#define G_TYPE_CLASS_GET_PRIVATE(klass, g_type, c_type)   ((c_type*) g_type_class_get_private ((GTypeClass*) (klass), (g_type)))
-
-/**
- * GTypeDebugFlags:
- * @G_TYPE_DEBUG_NONE: Print no messages.
- * @G_TYPE_DEBUG_OBJECTS: Print messages about object bookkeeping.
- * @G_TYPE_DEBUG_SIGNALS: Print messages about signal emissions.
- * @G_TYPE_DEBUG_MASK: Mask covering all debug flags.
- *
- * These flags used to be passed to g_type_init_with_debug_flags() which
- * is now deprecated.
- *
- * If you need to enable debugging features, use the GOBJECT_DEBUG
- * environment variable.
- *
- * Deprecated: 2.36: g_type_init() is now done automatically
- */
-typedef enum	/*< skip >*/
-{
-  G_TYPE_DEBUG_NONE	= 0,
-  G_TYPE_DEBUG_OBJECTS	= 1 << 0,
-  G_TYPE_DEBUG_SIGNALS	= 1 << 1,
-  G_TYPE_DEBUG_MASK	= 0x03
-} GTypeDebugFlags;
-
-
-/* --- prototypes --- */
-GLIB_DEPRECATED_IN_2_36
-void                  g_type_init                    (void);
-GLIB_DEPRECATED_IN_2_36
-void                  g_type_init_with_debug_flags   (GTypeDebugFlags  debug_flags);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_type_name                    (GType            type);
-GLIB_AVAILABLE_IN_ALL
-GQuark                g_type_qname                   (GType            type);
-GLIB_AVAILABLE_IN_ALL
-GType                 g_type_from_name               (const gchar     *name);
-GLIB_AVAILABLE_IN_ALL
-GType                 g_type_parent                  (GType            type);
-GLIB_AVAILABLE_IN_ALL
-guint                 g_type_depth                   (GType            type);
-GLIB_AVAILABLE_IN_ALL
-GType                 g_type_next_base               (GType            leaf_type,
-						      GType            root_type);
-GLIB_AVAILABLE_IN_ALL
-gboolean              g_type_is_a                    (GType            type,
-						      GType            is_a_type);
-GLIB_AVAILABLE_IN_ALL
-gpointer              g_type_class_ref               (GType            type);
-GLIB_AVAILABLE_IN_ALL
-gpointer              g_type_class_peek              (GType            type);
-GLIB_AVAILABLE_IN_ALL
-gpointer              g_type_class_peek_static       (GType            type);
-GLIB_AVAILABLE_IN_ALL
-void                  g_type_class_unref             (gpointer         g_class);
-GLIB_AVAILABLE_IN_ALL
-gpointer              g_type_class_peek_parent       (gpointer         g_class);
-GLIB_AVAILABLE_IN_ALL
-gpointer              g_type_interface_peek          (gpointer         instance_class,
-						      GType            iface_type);
-GLIB_AVAILABLE_IN_ALL
-gpointer              g_type_interface_peek_parent   (gpointer         g_iface);
-
-GLIB_AVAILABLE_IN_ALL
-gpointer              g_type_default_interface_ref   (GType            g_type);
-GLIB_AVAILABLE_IN_ALL
-gpointer              g_type_default_interface_peek  (GType            g_type);
-GLIB_AVAILABLE_IN_ALL
-void                  g_type_default_interface_unref (gpointer         g_iface);
-
-/* g_free() the returned arrays */
-GLIB_AVAILABLE_IN_ALL
-GType*                g_type_children                (GType            type,
-						      guint           *n_children);
-GLIB_AVAILABLE_IN_ALL
-GType*                g_type_interfaces              (GType            type,
-						      guint           *n_interfaces);
-
-/* per-type _static_ data */
-GLIB_AVAILABLE_IN_ALL
-void                  g_type_set_qdata               (GType            type,
-						      GQuark           quark,
-						      gpointer         data);
-GLIB_AVAILABLE_IN_ALL
-gpointer              g_type_get_qdata               (GType            type,
-						      GQuark           quark);
-GLIB_AVAILABLE_IN_ALL
-void		      g_type_query		     (GType	       type,
-						      GTypeQuery      *query);
-
-
-/* --- type registration --- */
-/**
- * GBaseInitFunc:
- * @g_class: The #GTypeClass structure to initialize.
- * 
- * A callback function used by the type system to do base initialization
- * of the class structures of derived types. It is called as part of the
- * initialization process of all derived classes and should reallocate
- * or reset all dynamic class members copied over from the parent class.
- * For example, class members (such as strings) that are not sufficiently
- * handled by a plain memory copy of the parent class into the derived class
- * have to be altered. See GClassInitFunc() for a discussion of the class
- * intialization process.
- */
-typedef void   (*GBaseInitFunc)              (gpointer         g_class);
-/**
- * GBaseFinalizeFunc:
- * @g_class: The #GTypeClass structure to finalize.
- * 
- * A callback function used by the type system to finalize those portions
- * of a derived types class structure that were setup from the corresponding
- * GBaseInitFunc() function. Class finalization basically works the inverse
- * way in which class intialization is performed.
- * See GClassInitFunc() for a discussion of the class intialization process.
- */
-typedef void   (*GBaseFinalizeFunc)          (gpointer         g_class);
-/**
- * GClassInitFunc:
- * @g_class: The #GTypeClass structure to initialize.
- * @class_data: The @class_data member supplied via the #GTypeInfo structure.
- * 
- * A callback function used by the type system to initialize the class
- * of a specific type. This function should initialize all static class
- * members.
- * The initialization process of a class involves:
- * <itemizedlist>
- * <listitem><para>
- * 	1 - Copying common members from the parent class over to the
- * 	derived class structure.
- * </para></listitem>
- * <listitem><para>
- * 	2 -  Zero initialization of the remaining members not copied
- * 	over from the parent class.
- * </para></listitem>
- * <listitem><para>
- * 	3 - Invocation of the GBaseInitFunc() initializers of all parent
- * 	types and the class' type.
- * </para></listitem>
- * <listitem><para>
- * 	4 - Invocation of the class' GClassInitFunc() initializer.
- * </para></listitem>
- * </itemizedlist>
- * Since derived classes are partially initialized through a memory copy
- * of the parent class, the general rule is that GBaseInitFunc() and
- * GBaseFinalizeFunc() should take care of necessary reinitialization
- * and release of those class members that were introduced by the type
- * that specified these GBaseInitFunc()/GBaseFinalizeFunc().
- * GClassInitFunc() should only care about initializing static
- * class members, while dynamic class members (such as allocated strings
- * or reference counted resources) are better handled by a GBaseInitFunc()
- * for this type, so proper initialization of the dynamic class members
- * is performed for class initialization of derived types as well.
- * An example may help to correspond the intend of the different class
- * initializers:
- * 
- * |[
- * typedef struct {
- *   GObjectClass parent_class;
- *   gint         static_integer;
- *   gchar       *dynamic_string;
- * } TypeAClass;
- * static void
- * type_a_base_class_init (TypeAClass *class)
- * {
- *   class->dynamic_string = g_strdup ("some string");
- * }
- * static void
- * type_a_base_class_finalize (TypeAClass *class)
- * {
- *   g_free (class->dynamic_string);
- * }
- * static void
- * type_a_class_init (TypeAClass *class)
- * {
- *   class->static_integer = 42;
- * }
- * 
- * typedef struct {
- *   TypeAClass   parent_class;
- *   gfloat       static_float;
- *   GString     *dynamic_gstring;
- * } TypeBClass;
- * static void
- * type_b_base_class_init (TypeBClass *class)
- * {
- *   class->dynamic_gstring = g_string_new ("some other string");
- * }
- * static void
- * type_b_base_class_finalize (TypeBClass *class)
- * {
- *   g_string_free (class->dynamic_gstring);
- * }
- * static void
- * type_b_class_init (TypeBClass *class)
- * {
- *   class->static_float = 3.14159265358979323846;
- * }
- * ]|
- * Initialization of TypeBClass will first cause initialization of
- * TypeAClass (derived classes reference their parent classes, see
- * g_type_class_ref() on this).
- * Initialization of TypeAClass roughly involves zero-initializing its fields,
- * then calling its GBaseInitFunc() type_a_base_class_init() to allocate
- * its dynamic members (dynamic_string), and finally calling its GClassInitFunc()
- * type_a_class_init() to initialize its static members (static_integer).
- * The first step in the initialization process of TypeBClass is then
- * a plain memory copy of the contents of TypeAClass into TypeBClass and 
- * zero-initialization of the remaining fields in TypeBClass.
- * The dynamic members of TypeAClass within TypeBClass now need
- * reinitialization which is performed by calling type_a_base_class_init()
- * with an argument of TypeBClass.
- * After that, the GBaseInitFunc() of TypeBClass, type_b_base_class_init()
- * is called to allocate the dynamic members of TypeBClass (dynamic_gstring),
- * and finally the GClassInitFunc() of TypeBClass, type_b_class_init(),
- * is called to complete the initialization process with the static members
- * (static_float).
- * Corresponding finalization counter parts to the GBaseInitFunc() functions
- * have to be provided to release allocated resources at class finalization
- * time.
- */
-typedef void   (*GClassInitFunc)             (gpointer         g_class,
-					      gpointer         class_data);
-/**
- * GClassFinalizeFunc:
- * @g_class: The #GTypeClass structure to finalize.
- * @class_data: The @class_data member supplied via the #GTypeInfo structure.
- * 
- * A callback function used by the type system to finalize a class.
- * This function is rarely needed, as dynamically allocated class resources
- * should be handled by GBaseInitFunc() and GBaseFinalizeFunc().
- * Also, specification of a GClassFinalizeFunc() in the #GTypeInfo
- * structure of a static type is invalid, because classes of static types
- * will never be finalized (they are artificially kept alive when their
- * reference count drops to zero).
- */
-typedef void   (*GClassFinalizeFunc)         (gpointer         g_class,
-					      gpointer         class_data);
-/**
- * GInstanceInitFunc:
- * @instance: The instance to initialize.
- * @g_class: The class of the type the instance is created for.
- * 
- * A callback function used by the type system to initialize a new
- * instance of a type. This function initializes all instance members and
- * allocates any resources required by it.
- * Initialization of a derived instance involves calling all its parent
- * types instance initializers, so the class member of the instance
- * is altered during its initialization to always point to the class that
- * belongs to the type the current initializer was introduced for.
- */
-typedef void   (*GInstanceInitFunc)          (GTypeInstance   *instance,
-					      gpointer         g_class);
-/**
- * GInterfaceInitFunc:
- * @g_iface: The interface structure to initialize.
- * @iface_data: The @interface_data supplied via the #GInterfaceInfo structure.
- * 
- * A callback function used by the type system to initialize a new
- * interface.  This function should initialize all internal data and
- * allocate any resources required by the interface.
- */
-typedef void   (*GInterfaceInitFunc)         (gpointer         g_iface,
-					      gpointer         iface_data);
-/**
- * GInterfaceFinalizeFunc:
- * @g_iface: The interface structure to finalize.
- * @iface_data: The @interface_data supplied via the #GInterfaceInfo structure.
- * 
- * A callback function used by the type system to finalize an interface.
- * This function should destroy any internal data and release any resources
- * allocated by the corresponding GInterfaceInitFunc() function.
- */
-typedef void   (*GInterfaceFinalizeFunc)     (gpointer         g_iface,
-					      gpointer         iface_data);
-/**
- * GTypeClassCacheFunc:
- * @cache_data: data that was given to the g_type_add_class_cache_func() call
- * @g_class: The #GTypeClass structure which is unreferenced
- * 
- * A callback function which is called when the reference count of a class 
- * drops to zero. It may use g_type_class_ref() to prevent the class from
- * being freed. You should not call g_type_class_unref() from a 
- * #GTypeClassCacheFunc function to prevent infinite recursion, use 
- * g_type_class_unref_uncached() instead.
- * 
- * The functions have to check the class id passed in to figure 
- * whether they actually want to cache the class of this type, since all
- * classes are routed through the same #GTypeClassCacheFunc chain.
- * 
- * Returns: %TRUE to stop further #GTypeClassCacheFunc<!-- -->s from being 
- *  called, %FALSE to continue.
- */
-typedef gboolean (*GTypeClassCacheFunc)	     (gpointer	       cache_data,
-					      GTypeClass      *g_class);
-/**
- * GTypeInterfaceCheckFunc:
- * @check_data: data passed to g_type_add_interface_check().
- * @g_iface: the interface that has been initialized
- * 
- * A callback called after an interface vtable is initialized.
- * See g_type_add_interface_check().
- * 
- * Since: 2.4
- */
-typedef void     (*GTypeInterfaceCheckFunc)  (gpointer	       check_data,
-					      gpointer         g_iface);
-/**
- * GTypeFundamentalFlags:
- * @G_TYPE_FLAG_CLASSED: Indicates a classed type.
- * @G_TYPE_FLAG_INSTANTIATABLE: Indicates an instantiable type (implies classed).
- * @G_TYPE_FLAG_DERIVABLE: Indicates a flat derivable type.
- * @G_TYPE_FLAG_DEEP_DERIVABLE: Indicates a deep derivable type (implies derivable).
- * 
- * Bit masks used to check or determine specific characteristics of a
- * fundamental type.
- */
-typedef enum    /*< skip >*/
-{
-  G_TYPE_FLAG_CLASSED           = (1 << 0),
-  G_TYPE_FLAG_INSTANTIATABLE    = (1 << 1),
-  G_TYPE_FLAG_DERIVABLE         = (1 << 2),
-  G_TYPE_FLAG_DEEP_DERIVABLE    = (1 << 3)
-} GTypeFundamentalFlags;
-/**
- * GTypeFlags:
- * @G_TYPE_FLAG_ABSTRACT: Indicates an abstract type. No instances can be
- *  created for an abstract type.
- * @G_TYPE_FLAG_VALUE_ABSTRACT: Indicates an abstract value type, i.e. a type
- *  that introduces a value table, but can't be used for
- *  g_value_init().
- * 
- * Bit masks used to check or determine characteristics of a type.
- */
-typedef enum    /*< skip >*/
-{
-  G_TYPE_FLAG_ABSTRACT		= (1 << 4),
-  G_TYPE_FLAG_VALUE_ABSTRACT	= (1 << 5)
-} GTypeFlags;
-/**
- * GTypeInfo:
- * @class_size: Size of the class structure (required for interface, classed and instantiatable types).
- * @base_init: Location of the base initialization function (optional).
- * @base_finalize: Location of the base finalization function (optional).
- * @class_init: Location of the class initialization function for
- *  classed and instantiatable types. Location of the default vtable 
- *  inititalization function for interface types. (optional) This function 
- *  is used both to fill in virtual functions in the class or default vtable, 
- *  and to do type-specific setup such as registering signals and object
- *  properties.
- * @class_finalize: Location of the class finalization function for
- *  classed and instantiatable types. Location fo the default vtable 
- *  finalization function for interface types. (optional)
- * @class_data: User-supplied data passed to the class init/finalize functions.
- * @instance_size: Size of the instance (object) structure (required for instantiatable types only).
- * @n_preallocs: Prior to GLib 2.10, it specified the number of pre-allocated (cached) instances to reserve memory for (0 indicates no caching). Since GLib 2.10, it is ignored, since instances are allocated with the <link linkend="glib-Memory-Slices">slice allocator</link> now.
- * @instance_init: Location of the instance initialization function (optional, for instantiatable types only).
- * @value_table: A #GTypeValueTable function table for generic handling of GValues of this type (usually only
- *  useful for fundamental types).
- * 
- * This structure is used to provide the type system with the information
- * required to initialize and destruct (finalize) a type's class and
- * its instances.
- * The initialized structure is passed to the g_type_register_static() function
- * (or is copied into the provided #GTypeInfo structure in the
- * g_type_plugin_complete_type_info()). The type system will perform a deep
- * copy of this structure, so its memory does not need to be persistent
- * across invocation of g_type_register_static().
- */
-struct _GTypeInfo
-{
-  /* interface types, classed types, instantiated types */
-  guint16                class_size;
-  
-  GBaseInitFunc          base_init;
-  GBaseFinalizeFunc      base_finalize;
-  
-  /* interface types, classed types, instantiated types */
-  GClassInitFunc         class_init;
-  GClassFinalizeFunc     class_finalize;
-  gconstpointer          class_data;
-  
-  /* instantiated types */
-  guint16                instance_size;
-  guint16                n_preallocs;
-  GInstanceInitFunc      instance_init;
-  
-  /* value handling */
-  const GTypeValueTable	*value_table;
-};
-/**
- * GTypeFundamentalInfo:
- * @type_flags: #GTypeFundamentalFlags describing the characteristics of the fundamental type
- * 
- * A structure that provides information to the type system which is
- * used specifically for managing fundamental types.  
- */
-struct _GTypeFundamentalInfo
-{
-  GTypeFundamentalFlags  type_flags;
-};
-/**
- * GInterfaceInfo:
- * @interface_init: location of the interface initialization function
- * @interface_finalize: location of the interface finalization function
- * @interface_data: user-supplied data passed to the interface init/finalize functions
- * 
- * A structure that provides information to the type system which is
- * used specifically for managing interface types.
- */
-struct _GInterfaceInfo
-{
-  GInterfaceInitFunc     interface_init;
-  GInterfaceFinalizeFunc interface_finalize;
-  gpointer               interface_data;
-};
-/**
- * GTypeValueTable:
- * @value_init: Default initialize @values contents by poking values
- *  directly into the value->data array. The data array of
- *  the #GValue passed into this function was zero-filled
- *  with <function>memset()</function>, so no care has to
- *  be taken to free any
- *  old contents. E.g. for the implementation of a string
- *  value that may never be %NULL, the implementation might
- *  look like:
- *  |[
- *  value->data[0].v_pointer = g_strdup ("");
- *  ]|
- * @value_free: Free any old contents that might be left in the
- *  data array of the passed in @value. No resources may
- *  remain allocated through the #GValue contents after
- *  this function returns. E.g. for our above string type:
- *  |[
- *  // only free strings without a specific flag for static storage
- *  if (!(value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS))
- *    g_free (value->data[0].v_pointer);
- *  ]|
- * @value_copy: @dest_value is a #GValue with zero-filled data section
- *  and @src_value is a properly setup #GValue of same or
- *  derived type.
- *  The purpose of this function is to copy the contents of
- *  @src_value into @dest_value in a way, that even after
- *  @src_value has been freed, the contents of @dest_value
- *  remain valid. String type example:
- *  |[
- *  dest_value->data[0].v_pointer = g_strdup (src_value->data[0].v_pointer);
- *  ]|
- * @value_peek_pointer: If the value contents fit into a pointer, such as objects
- *  or strings, return this pointer, so the caller can peek at
- *  the current contents. To extend on our above string example:
- *  |[
- *  return value->data[0].v_pointer;
- *  ]|
- * @collect_format: A string format describing how to collect the contents of
- *  this value bit-by-bit. Each character in the format represents
- *  an argument to be collected, and the characters themselves indicate
- *  the type of the argument. Currently supported arguments are:
- *  <variablelist>
- *  <varlistentry><term /><listitem><para>
- *  'i' - Integers. passed as collect_values[].v_int.
- *  </para></listitem></varlistentry>
- *  <varlistentry><term /><listitem><para>
- *  'l' - Longs. passed as collect_values[].v_long.
- *  </para></listitem></varlistentry>
- *  <varlistentry><term /><listitem><para>
- *  'd' - Doubles. passed as collect_values[].v_double.
- *  </para></listitem></varlistentry>
- *  <varlistentry><term /><listitem><para>
- *  'p' - Pointers. passed as collect_values[].v_pointer.
- *  </para></listitem></varlistentry>
- *  </variablelist>
- *  It should be noted that for variable argument list construction,
- *  ANSI C promotes every type smaller than an integer to an int, and
- *  floats to doubles. So for collection of short int or char, 'i'
- *  needs to be used, and for collection of floats 'd'.
- * @collect_value: The collect_value() function is responsible for converting the
- *  values collected from a variable argument list into contents
- *  suitable for storage in a GValue. This function should setup
- *  @value similar to value_init(); e.g. for a string value that
- *  does not allow %NULL pointers, it needs to either spew an error,
- *  or do an implicit conversion by storing an empty string.
- *  The @value passed in to this function has a zero-filled data
- *  array, so just like for value_init() it is guaranteed to not
- *  contain any old contents that might need freeing.
- *  @n_collect_values is exactly the string length of @collect_format,
- *  and @collect_values is an array of unions #GTypeCValue with
- *  length @n_collect_values, containing the collected values
- *  according to @collect_format.
- *  @collect_flags is an argument provided as a hint by the caller.
- *  It may contain the flag %G_VALUE_NOCOPY_CONTENTS indicating,
- *  that the collected value contents may be considered "static"
- *  for the duration of the @value lifetime.
- *  Thus an extra copy of the contents stored in @collect_values is
- *  not required for assignment to @value.
- *  For our above string example, we continue with:
- *  |[
- *  if (!collect_values[0].v_pointer)
- *    value->data[0].v_pointer = g_strdup ("");
- *  else if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
- *  {
- *    value->data[0].v_pointer = collect_values[0].v_pointer;
- *    // keep a flag for the value_free() implementation to not free this string
- *    value->data[1].v_uint = G_VALUE_NOCOPY_CONTENTS;
- *  }
- *  else
- *    value->data[0].v_pointer = g_strdup (collect_values[0].v_pointer);
- *  return NULL;
- *  ]|
- *  It should be noted, that it is generally a bad idea to follow the
- *  #G_VALUE_NOCOPY_CONTENTS hint for reference counted types. Due to
- *  reentrancy requirements and reference count assertions performed
- *  by the signal emission code, reference counts should always be
- *  incremented for reference counted contents stored in the value->data
- *  array.  To deviate from our string example for a moment, and taking
- *  a look at an exemplary implementation for collect_value() of
- *  #GObject:
- *  |[
- *  if (collect_values[0].v_pointer)
- *  {
- *    GObject *object = G_OBJECT (collect_values[0].v_pointer);
- *    // never honour G_VALUE_NOCOPY_CONTENTS for ref-counted types
- *    value->data[0].v_pointer = g_object_ref (object);
- *    return NULL;
- *  }
- *  else
- *    return g_strdup_printf ("Object passed as invalid NULL pointer");
- *  }
- *  ]|
- *  The reference count for valid objects is always incremented,
- *  regardless of @collect_flags. For invalid objects, the example
- *  returns a newly allocated string without altering @value.
- *  Upon success, collect_value() needs to return %NULL. If, however,
- *  an error condition occurred, collect_value() may spew an
- *  error by returning a newly allocated non-%NULL string, giving
- *  a suitable description of the error condition.
- *  The calling code makes no assumptions about the @value
- *  contents being valid upon error returns, @value
- *  is simply thrown away without further freeing. As such, it is
- *  a good idea to not allocate #GValue contents, prior to returning
- *  an error, however, collect_values() is not obliged to return
- *  a correctly setup @value for error returns, simply because
- *  any non-%NULL return is considered a fatal condition so further
- *  program behaviour is undefined.
- * @lcopy_format: Format description of the arguments to collect for @lcopy_value,
- *  analogous to @collect_format. Usually, @lcopy_format string consists
- *  only of 'p's to provide lcopy_value() with pointers to storage locations.
- * @lcopy_value: This function is responsible for storing the @value contents into
- *  arguments passed through a variable argument list which got
- *  collected into @collect_values according to @lcopy_format.
- *  @n_collect_values equals the string length of @lcopy_format,
- *  and @collect_flags may contain %G_VALUE_NOCOPY_CONTENTS.
- *  In contrast to collect_value(), lcopy_value() is obliged to
- *  always properly support %G_VALUE_NOCOPY_CONTENTS.
- *  Similar to collect_value() the function may prematurely abort
- *  by returning a newly allocated string describing an error condition.
- *  To complete the string example:
- *  |[
- *  gchar **string_p = collect_values[0].v_pointer;
- *  if (!string_p)
- *    return g_strdup_printf ("string location passed as NULL");
- *  if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
- *    *string_p = value->data[0].v_pointer;
- *  else
- *    *string_p = g_strdup (value->data[0].v_pointer);
- *  ]|
- *  And an illustrative version of lcopy_value() for
- *  reference-counted types:
- *  |[
- *  GObject **object_p = collect_values[0].v_pointer;
- *  if (!object_p)
- *    return g_strdup_printf ("object location passed as NULL");
- *  if (!value->data[0].v_pointer)
- *    *object_p = NULL;
- *  else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) /&ast; always honour &ast;/
- *    *object_p = value->data[0].v_pointer;
- *  else
- *    *object_p = g_object_ref (value->data[0].v_pointer);
- *  return NULL;
- *  ]|
- * 
- * The #GTypeValueTable provides the functions required by the #GValue implementation,
- * to serve as a container for values of a type.
- */
-
-struct _GTypeValueTable
-{
-  void     (*value_init)         (GValue       *value);
-  void     (*value_free)         (GValue       *value);
-  void     (*value_copy)         (const GValue *src_value,
-				  GValue       *dest_value);
-  /* varargs functionality (optional) */
-  gpointer (*value_peek_pointer) (const GValue *value);
-  const gchar *collect_format;
-  gchar*   (*collect_value)      (GValue       *value,
-				  guint         n_collect_values,
-				  GTypeCValue  *collect_values,
-				  guint		collect_flags);
-  const gchar *lcopy_format;
-  gchar*   (*lcopy_value)        (const GValue *value,
-				  guint         n_collect_values,
-				  GTypeCValue  *collect_values,
-				  guint		collect_flags);
-};
-GLIB_AVAILABLE_IN_ALL
-GType g_type_register_static		(GType			     parent_type,
-					 const gchar		    *type_name,
-					 const GTypeInfo	    *info,
-					 GTypeFlags		     flags);
-GLIB_AVAILABLE_IN_ALL
-GType g_type_register_static_simple     (GType                       parent_type,
-					 const gchar                *type_name,
-					 guint                       class_size,
-					 GClassInitFunc              class_init,
-					 guint                       instance_size,
-					 GInstanceInitFunc           instance_init,
-					 GTypeFlags	             flags);
-  
-GLIB_AVAILABLE_IN_ALL
-GType g_type_register_dynamic		(GType			     parent_type,
-					 const gchar		    *type_name,
-					 GTypePlugin		    *plugin,
-					 GTypeFlags		     flags);
-GLIB_AVAILABLE_IN_ALL
-GType g_type_register_fundamental	(GType			     type_id,
-					 const gchar		    *type_name,
-					 const GTypeInfo	    *info,
-					 const GTypeFundamentalInfo *finfo,
-					 GTypeFlags		     flags);
-GLIB_AVAILABLE_IN_ALL
-void  g_type_add_interface_static	(GType			     instance_type,
-					 GType			     interface_type,
-					 const GInterfaceInfo	    *info);
-GLIB_AVAILABLE_IN_ALL
-void  g_type_add_interface_dynamic	(GType			     instance_type,
-					 GType			     interface_type,
-					 GTypePlugin		    *plugin);
-GLIB_AVAILABLE_IN_ALL
-void  g_type_interface_add_prerequisite (GType			     interface_type,
-					 GType			     prerequisite_type);
-GLIB_AVAILABLE_IN_ALL
-GType*g_type_interface_prerequisites    (GType                       interface_type,
-					 guint                      *n_prerequisites);
-GLIB_AVAILABLE_IN_ALL
-void     g_type_class_add_private       (gpointer                    g_class,
-                                         gsize                       private_size);
-GLIB_AVAILABLE_IN_2_38
-gint     g_type_add_instance_private    (GType                       class_type,
-                                         gsize                       private_size);
-GLIB_AVAILABLE_IN_ALL
-gpointer g_type_instance_get_private    (GTypeInstance              *instance,
-                                         GType                       private_type);
-GLIB_AVAILABLE_IN_2_38
-void     g_type_class_adjust_private_offset (gpointer                g_class,
-                                             gint                   *private_size_or_offset);
-
-GLIB_AVAILABLE_IN_ALL
-void      g_type_add_class_private      (GType    		     class_type,
-					 gsize    		     private_size);
-GLIB_AVAILABLE_IN_ALL
-gpointer  g_type_class_get_private      (GTypeClass 		    *klass,
-					 GType			     private_type);
-GLIB_AVAILABLE_IN_2_38
-gint      g_type_class_get_instance_private_offset (gpointer         g_class);
-
-GLIB_AVAILABLE_IN_2_34
-void      g_type_ensure                 (GType                       type);
-GLIB_AVAILABLE_IN_2_36
-guint     g_type_get_type_registration_serial (void);
-
-
-/* --- GType boilerplate --- */
-/**
- * G_DEFINE_TYPE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * 
- * A convenience macro for type implementations, which declares a 
- * class initialization function, an instance initialization function (see #GTypeInfo for information about 
- * these) and a static variable named @t_n<!-- -->_parent_class pointing to the parent class. Furthermore, it defines 
- * a *_get_type() function. See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_TYPE(TN, t_n, T_P)			    G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-/**
- * G_DEFINE_TYPE_WITH_CODE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type in lowercase, with words separated by '_'.
- * @T_P: The #GType of the parent type.
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- * 
- * A convenience macro for type implementations.  
- * Similar to G_DEFINE_TYPE(), but allows you to insert custom code into the 
- * *_get_type() function, e.g. interface implementations via G_IMPLEMENT_INTERFACE().
- * See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)	    _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, 0) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-/**
- * G_DEFINE_TYPE_WITH_PRIVATE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * 
- * A convenience macro for type implementations, which declares a 
- * class initialization function, an instance initialization function (see #GTypeInfo for information about 
- * these), a static variable named @t_n<!-- -->_parent_class pointing to the parent class, and adds private
- * instance data to the type. Furthermore, it defines a *_get_type() function. See G_DEFINE_TYPE_EXTENDED()
- * for an example.
- * 
- * Note that private structs added with this macros must have a struct
- * name of the form <replaceable>@TN</replaceable>Private.
- *
- * Since: 2.38
- */
-#define G_DEFINE_TYPE_WITH_PRIVATE(TN, t_n, T_P)            G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, G_ADD_PRIVATE (TN))
-/**
- * G_DEFINE_ABSTRACT_TYPE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * 
- * A convenience macro for type implementations. 
- * Similar to G_DEFINE_TYPE(), but defines an abstract type. 
- * See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P)		    G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT, {})
-/**
- * G_DEFINE_ABSTRACT_TYPE_WITH_CODE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * @_C_: Custom code that gets inserted in the @type_name_get_type() function.
- * 
- * A convenience macro for type implementations.
- * Similar to G_DEFINE_TYPE_WITH_CODE(), but defines an abstract type and allows you to 
- * insert custom code into the *_get_type() function, e.g. interface implementations 
- * via G_IMPLEMENT_INTERFACE(). See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-/**
- * G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- *
- * Similar to G_DEFINE_TYPE_WITH_PRIVATE(), but defines an abstract type. 
- * See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.38
- */
-#define G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(TN, t_n, T_P)   G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT, G_ADD_PRIVATE (TN))
-/**
- * G_DEFINE_TYPE_EXTENDED:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words
- *    separated by '_'.
- * @T_P: The #GType of the parent type.
- * @_f_: #GTypeFlags to pass to g_type_register_static()
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * The most general convenience macro for type implementations, on which
- * G_DEFINE_TYPE(), etc are based.
- *
- * |[
- * G_DEFINE_TYPE_EXTENDED (GtkGadget,
- *                         gtk_gadget,
- *                         GTK_TYPE_WIDGET,
- *                         0,
- *                         G_IMPLEMENT_INTERFACE (TYPE_GIZMO,
- *                                                gtk_gadget_gizmo_init));
- * ]|
- * expands to
- * |[
- * static void     gtk_gadget_init       (GtkGadget      *self);
- * static void     gtk_gadget_class_init (GtkGadgetClass *klass);
- * static gpointer gtk_gadget_parent_class = NULL;
- * static void     gtk_gadget_class_intern_init (gpointer klass)
- * {
- *   gtk_gadget_parent_class = g_type_class_peek_parent (klass);
- *   gtk_gadget_class_init ((GtkGadgetClass*) klass);
- * }
- *
- * GType
- * gtk_gadget_get_type (void)
- * {
- *   static volatile gsize g_define_type_id__volatile = 0;
- *   if (g_once_init_enter (&g_define_type_id__volatile))
- *     {
- *       GType g_define_type_id =
- *         g_type_register_static_simple (GTK_TYPE_WIDGET,
- *                                        g_intern_static_string ("GtkGadget"),
- *                                        sizeof (GtkGadgetClass),
- *                                        (GClassInitFunc) gtk_gadget_class_intern_init,
- *                                        sizeof (GtkGadget),
- *                                        (GInstanceInitFunc) gtk_gadget_init,
- *                                        0);
- *       {
- *         const GInterfaceInfo g_implement_interface_info = {
- *           (GInterfaceInitFunc) gtk_gadget_gizmo_init
- *         };
- *         g_type_add_interface_static (g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
- *       }
- *       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
- *     }
- *   return g_define_type_id__volatile;
- * }
- * ]|
- * The only pieces which have to be manually provided are the definitions of
- * the instance and class structure and the definitions of the instance and
- * class init functions.
- *
- * Since: 2.4
- */
-#define G_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)	    _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, _f_) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-
-/**
- * G_DEFINE_INTERFACE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words separated by '_'.
- * @T_P: The #GType of the prerequisite type for the interface, or 0
- * (%G_TYPE_INVALID) for no prerequisite type.
- *
- * A convenience macro for #GTypeInterface definitions, which declares
- * a default vtable initialization function and defines a *_get_type()
- * function.
- *
- * The macro expects the interface initialization function to have the
- * name <literal>t_n ## _default_init</literal>, and the interface
- * structure to have the name <literal>TN ## Interface</literal>.
- *
- * Since: 2.24
- */
-#define G_DEFINE_INTERFACE(TN, t_n, T_P)		    G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, ;)
-
-/**
- * G_DEFINE_INTERFACE_WITH_CODE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words separated by '_'.
- * @T_P: The #GType of the prerequisite type for the interface, or 0
- * (%G_TYPE_INVALID) for no prerequisite type.
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * A convenience macro for #GTypeInterface definitions. Similar to
- * G_DEFINE_INTERFACE(), but allows you to insert custom code into the
- * *_get_type() function, e.g. additional interface implementations
- * via G_IMPLEMENT_INTERFACE(), or additional prerequisite types. See
- * G_DEFINE_TYPE_EXTENDED() for a similar example using
- * G_DEFINE_TYPE_WITH_CODE().
- *
- * Since: 2.24
- */
-#define G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, _C_)     _G_DEFINE_INTERFACE_EXTENDED_BEGIN(TN, t_n, T_P) {_C_;} _G_DEFINE_INTERFACE_EXTENDED_END()
-
-/**
- * G_IMPLEMENT_INTERFACE:
- * @TYPE_IFACE: The #GType of the interface to add
- * @iface_init: The interface init function
- *
- * A convenience macro to ease interface addition in the @_C_ section
- * of G_DEFINE_TYPE_WITH_CODE() or G_DEFINE_ABSTRACT_TYPE_WITH_CODE().
- * See G_DEFINE_TYPE_EXTENDED() for an example.
- *
- * Note that this macro can only be used together with the G_DEFINE_TYPE_*
- * macros, since it depends on variable names from those macros.
- *
- * Since: 2.4
- */
-#define G_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init)       { \
-  const GInterfaceInfo g_implement_interface_info = { \
-    (GInterfaceInitFunc) iface_init, NULL, NULL \
-  }; \
-  g_type_add_interface_static (g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
-}
-
-/**
- * G_ADD_PRIVATE:
- * @TypeName: the name of the type in CamelCase
- *
- * A convenience macro to ease adding private data to instances of a new type
- * in the @_C_ section of G_DEFINE_TYPE_WITH_CODE() or
- * G_DEFINE_ABSTRACT_TYPE_WITH_CODE().
- *
- * For instance:
- *
- * |[
- *   typedef struct _MyObject MyObject;
- *   typedef struct _MyObjectClass MyObjectClass;
- *
- *   typedef struct {
- *     gint foo;
- *     gint bar;
- *   } MyObjectPrivate;
- *
- *   G_DEFINE_TYPE_WITH_CODE (MyObject, my_object, G_TYPE_OBJECT,
- *                            G_ADD_PRIVATE (MyObject))
- * ]|
- *
- * Will add MyObjectPrivate as the private data to any instance of the MyObject
- * type.
- *
- * G_DEFINE_TYPE_* macros will automatically create a private function
- * based on the arguments to this macro, which can be used to safely
- * retrieve the private data from an instance of the type; for instance:
- *
- * |[
- *   gint
- *   my_object_get_foo (MyObject *obj)
- *   {
- *     MyObjectPrivate *priv = my_object_get_instance_private (obj);
- *
- *     return priv->foo;
- *   }
- *
- *   void
- *   my_object_set_bar (MyObject *obj,
- *                      gint      bar)
- *   {
- *     MyObjectPrivate *priv = my_object_get_instance_private (obj);
- *
- *     if (priv->bar != bar)
- *       priv->bar = bar;
- *   }
- * ]|
- *
- * Note that this macro can only be used together with the G_DEFINE_TYPE_*
- * macros, since it depends on variable names from those macros.
- *
- * Also note that private structs added with these macros must have a struct
- * name of the form <replaceable>TypeName</replaceable>Private.
- *
- * Since: 2.38
- */
-#define G_ADD_PRIVATE(TypeName) { \
-  TypeName##_private_offset = \
-    g_type_add_instance_private (g_define_type_id, sizeof (TypeName##Private)); \
-}
-
-/**
- * G_PRIVATE_OFFSET:
- * @TypeName: the name of the type in CamelCase
- * @field: the name of the field in the private data structure
- *
- * Evaluates to the offset of the @field inside the instance private data
- * structure for @TypeName.
- *
- * Note that this macro can only be used together with the G_DEFINE_TYPE_*
- * and G_ADD_PRIVATE() macros, since it depends on variable names from
- * those macros.
- *
- * Since: 2.38
- */
-#define G_PRIVATE_OFFSET(TypeName, field) \
-  (TypeName##_private_offset + (G_STRUCT_OFFSET (TypeName##Private, field)))
-
-/**
- * G_PRIVATE_FIELD_P:
- * @TypeName: the name of the type in CamelCase
- * @inst: the instance of @TypeName you wish to access
- * @field_name: the name of the field in the private data structure
- *
- * Evaluates to a pointer to the @field_name inside the @inst private data
- * structure for @TypeName.
- *
- * Note that this macro can only be used together with the G_DEFINE_TYPE_*
- * and G_ADD_PRIVATE() macros, since it depends on variable names from
- * those macros.
- *
- * Since: 2.38
- */
-#define G_PRIVATE_FIELD_P(TypeName, inst, field_name) \
-  G_STRUCT_MEMBER_P (inst, G_PRIVATE_OFFSET (TypeName, field_name))
-
-/**
- * G_PRIVATE_FIELD:
- * @TypeName: the name of the type in CamelCase
- * @inst: the instance of @TypeName you wish to access
- * @field_type: the type of the field in the private data structure
- * @field_name: the name of the field in the private data structure
- *
- * Evaluates to the @field_name inside the @inst private data
- * structure for @TypeName.
- *
- * Note that this macro can only be used together with the G_DEFINE_TYPE_*
- * and G_ADD_PRIVATE() macros, since it depends on variable names from
- * those macros.
- *
- * Since: 2.38
- */
-#define G_PRIVATE_FIELD(TypeName, inst, field_type, field_name) \
-  G_STRUCT_MEMBER (field_type, inst, G_PRIVATE_OFFSET (TypeName, field_name))
-
-/* we need to have this macro under conditional expansion, as it references
- * a function that has been added in 2.38. see bug:
- * https://bugzilla.gnome.org/show_bug.cgi?id=703191
- */
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-#define _G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
-static void     type_name##_class_intern_init (gpointer klass) \
-{ \
-  type_name##_parent_class = g_type_class_peek_parent (klass); \
-  if (TypeName##_private_offset != 0) \
-    g_type_class_adjust_private_offset (klass, &TypeName##_private_offset); \
-  type_name##_class_init ((TypeName##Class*) klass); \
-}
-
-#else
-#define _G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
-static void     type_name##_class_intern_init (gpointer klass) \
-{ \
-  type_name##_parent_class = g_type_class_peek_parent (klass); \
-  type_name##_class_init ((TypeName##Class*) klass); \
-}
-#endif /* GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 */
-
-#define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \
-\
-static void     type_name##_init              (TypeName        *self); \
-static void     type_name##_class_init        (TypeName##Class *klass); \
-static gpointer type_name##_parent_class = NULL; \
-static gint     TypeName##_private_offset; \
-\
-_G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
-\
-static inline gpointer \
-type_name##_get_instance_private (TypeName *self) \
-{ \
-  return (G_STRUCT_MEMBER_P (self, TypeName##_private_offset)); \
-} \
-\
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_type_register_static_simple (TYPE_PARENT, \
-                                       g_intern_static_string (#TypeName), \
-                                       sizeof (TypeName##Class), \
-                                       (GClassInitFunc) type_name##_class_intern_init, \
-                                       sizeof (TypeName), \
-                                       (GInstanceInitFunc) type_name##_init, \
-                                       (GTypeFlags) flags); \
-      { /* custom code follows */
-#define _G_DEFINE_TYPE_EXTENDED_END()	\
-        /* following custom code */	\
-      }					\
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
-    }					\
-  return g_define_type_id__volatile;	\
-} /* closes type_name##_get_type() */
-
-#define _G_DEFINE_INTERFACE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PREREQ) \
-\
-static void     type_name##_default_init        (TypeName##Interface *klass); \
-\
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_type_register_static_simple (G_TYPE_INTERFACE, \
-                                       g_intern_static_string (#TypeName), \
-                                       sizeof (TypeName##Interface), \
-                                       (GClassInitFunc)type_name##_default_init, \
-                                       0, \
-                                       (GInstanceInitFunc)NULL, \
-                                       (GTypeFlags) 0); \
-      if (TYPE_PREREQ) \
-        g_type_interface_add_prerequisite (g_define_type_id, TYPE_PREREQ); \
-      { /* custom code follows */
-#define _G_DEFINE_INTERFACE_EXTENDED_END()	\
-        /* following custom code */		\
-      }						\
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
-    }						\
-  return g_define_type_id__volatile;			\
-} /* closes type_name##_get_type() */
-
-/**
- * G_DEFINE_BOXED_TYPE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @copy_func: the #GBoxedCopyFunc for the new type
- * @free_func: the #GBoxedFreeFunc for the new type
- *
- * A convenience macro for boxed type implementations, which defines a
- * type_name_get_type() function registering the boxed type.
- *
- * Since: 2.26
- */
-#define G_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) G_DEFINE_BOXED_TYPE_WITH_CODE (TypeName, type_name, copy_func, free_func, {})
-/**
- * G_DEFINE_BOXED_TYPE_WITH_CODE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @copy_func: the #GBoxedCopyFunc for the new type
- * @free_func: the #GBoxedFreeFunc for the new type
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * A convenience macro for boxed type implementations.
- * Similar to G_DEFINE_BOXED_TYPE(), but allows to insert custom code into the
- * type_name_get_type() function, e.g. to register value transformations with
- * g_value_register_transform_func().
- *
- * Since: 2.26
- */
-#define G_DEFINE_BOXED_TYPE_WITH_CODE(TypeName, type_name, copy_func, free_func, _C_) _G_DEFINE_BOXED_TYPE_BEGIN (TypeName, type_name, copy_func, free_func) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-
-/* Only use this in non-C++ on GCC >= 2.7, except for Darwin/ppc64.
- * See https://bugzilla.gnome.org/show_bug.cgi?id=647145
- */
-#if !defined (__cplusplus) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) && !(defined (__APPLE__) && defined (__ppc64__))
-#define _G_DEFINE_BOXED_TYPE_BEGIN(TypeName, type_name, copy_func, free_func) \
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType (* _g_register_boxed) \
-        (const gchar *, \
-         union \
-           { \
-             TypeName * (*do_copy_type) (TypeName *); \
-             TypeName * (*do_const_copy_type) (const TypeName *); \
-             GBoxedCopyFunc do_copy_boxed; \
-           } __attribute__((__transparent_union__)), \
-         union \
-           { \
-             void (* do_free_type) (TypeName *); \
-             GBoxedFreeFunc do_free_boxed; \
-           } __attribute__((__transparent_union__)) \
-        ) = g_boxed_type_register_static; \
-      GType g_define_type_id = \
-        _g_register_boxed (g_intern_static_string (#TypeName), copy_func, free_func); \
-      { /* custom code follows */
-#else
-#define _G_DEFINE_BOXED_TYPE_BEGIN(TypeName, type_name, copy_func, free_func) \
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_boxed_type_register_static (g_intern_static_string (#TypeName), \
-                                      (GBoxedCopyFunc) copy_func, \
-                                      (GBoxedFreeFunc) free_func); \
-      { /* custom code follows */
-#endif /* __GNUC__ */
-
-/**
- * G_DEFINE_POINTER_TYPE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- *
- * A convenience macro for pointer type implementations, which defines a
- * type_name_get_type() function registering the pointer type.
- *
- * Since: 2.26
- */
-#define G_DEFINE_POINTER_TYPE(TypeName, type_name) G_DEFINE_POINTER_TYPE_WITH_CODE (TypeName, type_name, {})
-/**
- * G_DEFINE_POINTER_TYPE_WITH_CODE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * A convenience macro for pointer type implementations.
- * Similar to G_DEFINE_POINTER_TYPE(), but allows to insert custom code into the
- * type_name_get_type() function.
- *
- * Since: 2.26
- */
-#define G_DEFINE_POINTER_TYPE_WITH_CODE(TypeName, type_name, _C_) _G_DEFINE_POINTER_TYPE_BEGIN (TypeName, type_name) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-
-#define _G_DEFINE_POINTER_TYPE_BEGIN(TypeName, type_name) \
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_pointer_type_register_static (g_intern_static_string (#TypeName)); \
-      { /* custom code follows */
-
-/* --- protected (for fundamental type implementations) --- */
-GLIB_AVAILABLE_IN_ALL
-GTypePlugin*	 g_type_get_plugin		(GType		     type);
-GLIB_AVAILABLE_IN_ALL
-GTypePlugin*	 g_type_interface_get_plugin	(GType		     instance_type,
-						 GType               interface_type);
-GLIB_AVAILABLE_IN_ALL
-GType		 g_type_fundamental_next	(void);
-GLIB_AVAILABLE_IN_ALL
-GType		 g_type_fundamental		(GType		     type_id);
-GLIB_AVAILABLE_IN_ALL
-GTypeInstance*   g_type_create_instance         (GType               type);
-GLIB_AVAILABLE_IN_ALL
-void             g_type_free_instance           (GTypeInstance      *instance);
-
-GLIB_AVAILABLE_IN_ALL
-void		 g_type_add_class_cache_func    (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-GLIB_AVAILABLE_IN_ALL
-void		 g_type_remove_class_cache_func (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-GLIB_AVAILABLE_IN_ALL
-void             g_type_class_unref_uncached    (gpointer            g_class);
-
-GLIB_AVAILABLE_IN_ALL
-void             g_type_add_interface_check     (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-GLIB_AVAILABLE_IN_ALL
-void             g_type_remove_interface_check  (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-
-GLIB_AVAILABLE_IN_ALL
-GTypeValueTable* g_type_value_table_peek        (GType		     type);
-
-
-/*< private >*/
-GLIB_AVAILABLE_IN_ALL
-gboolean	 g_type_check_instance          (GTypeInstance      *instance) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-GTypeInstance*   g_type_check_instance_cast     (GTypeInstance      *instance,
-						 GType               iface_type);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_type_check_instance_is_a	(GTypeInstance      *instance,
-						 GType               iface_type) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-GTypeClass*      g_type_check_class_cast        (GTypeClass         *g_class,
-						 GType               is_a_type);
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_type_check_class_is_a        (GTypeClass         *g_class,
-						 GType               is_a_type) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-gboolean	 g_type_check_is_value_type     (GType		     type) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean	 g_type_check_value             (GValue		    *value) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-gboolean	 g_type_check_value_holds	(GValue		    *value,
-						 GType		     type) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
-gboolean         g_type_test_flags              (GType               type,
-						 guint               flags) G_GNUC_CONST;
-
-
-/* --- debugging functions --- */
-GLIB_AVAILABLE_IN_ALL
-const gchar *    g_type_name_from_instance      (GTypeInstance	*instance);
-GLIB_AVAILABLE_IN_ALL
-const gchar *    g_type_name_from_class         (GTypeClass	*g_class);
-
-
-/* --- implementation bits --- */
-#ifndef G_DISABLE_CAST_CHECKS
-#  define _G_TYPE_CIC(ip, gt, ct) \
-    ((ct*) g_type_check_instance_cast ((GTypeInstance*) ip, gt))
-#  define _G_TYPE_CCC(cp, gt, ct) \
-    ((ct*) g_type_check_class_cast ((GTypeClass*) cp, gt))
-#else /* G_DISABLE_CAST_CHECKS */
-#  define _G_TYPE_CIC(ip, gt, ct)       ((ct*) ip)
-#  define _G_TYPE_CCC(cp, gt, ct)       ((ct*) cp)
-#endif /* G_DISABLE_CAST_CHECKS */
-#define _G_TYPE_CHI(ip)			(g_type_check_instance ((GTypeInstance*) ip))
-#define _G_TYPE_CHV(vl)			(g_type_check_value ((GValue*) vl))
-#define _G_TYPE_IGC(ip, gt, ct)         ((ct*) (((GTypeInstance*) ip)->g_class))
-#define _G_TYPE_IGI(ip, gt, ct)         ((ct*) g_type_interface_peek (((GTypeInstance*) ip)->g_class, gt))
-#ifdef	__GNUC__
-#  define _G_TYPE_CIT(ip, gt)             (G_GNUC_EXTENSION ({ \
-  GTypeInstance *__inst = (GTypeInstance*) ip; GType __t = gt; gboolean __r; \
-  if (!__inst) \
-    __r = FALSE; \
-  else if (__inst->g_class && __inst->g_class->g_type == __t) \
-    __r = TRUE; \
-  else \
-    __r = g_type_check_instance_is_a (__inst, __t); \
-  __r; \
-}))
-#  define _G_TYPE_CCT(cp, gt)             (G_GNUC_EXTENSION ({ \
-  GTypeClass *__class = (GTypeClass*) cp; GType __t = gt; gboolean __r; \
-  if (!__class) \
-    __r = FALSE; \
-  else if (__class->g_type == __t) \
-    __r = TRUE; \
-  else \
-    __r = g_type_check_class_is_a (__class, __t); \
-  __r; \
-}))
-#  define _G_TYPE_CVH(vl, gt)             (G_GNUC_EXTENSION ({ \
-  GValue *__val = (GValue*) vl; GType __t = gt; gboolean __r; \
-  if (!__val) \
-    __r = FALSE; \
-  else if (__val->g_type == __t)		\
-    __r = TRUE; \
-  else \
-    __r = g_type_check_value_holds (__val, __t); \
-  __r; \
-}))
-#else  /* !__GNUC__ */
-#  define _G_TYPE_CIT(ip, gt)             (g_type_check_instance_is_a ((GTypeInstance*) ip, gt))
-#  define _G_TYPE_CCT(cp, gt)             (g_type_check_class_is_a ((GTypeClass*) cp, gt))
-#  define _G_TYPE_CVH(vl, gt)             (g_type_check_value_holds ((GValue*) vl, gt))
-#endif /* !__GNUC__ */
-/**
- * G_TYPE_FLAG_RESERVED_ID_BIT:
- * 
- * A bit in the type number that's supposed to be left untouched.
- */
-#define	G_TYPE_FLAG_RESERVED_ID_BIT	((GType) (1 << 0))
-extern GTypeDebugFlags			_g_type_debug_flags;
-
-G_END_DECLS
-
-#endif /* __G_TYPE_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gtypemodule.h b/linux-x86/include/glib-2.0/gobject/gtypemodule.h
deleted file mode 100644
index 2580e1b..0000000
--- a/linux-x86/include/glib-2.0/gobject/gtypemodule.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __G_TYPE_MODULE_H__
-#define __G_TYPE_MODULE_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include <gobject/gobject.h>
-#include <gobject/genums.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTypeModule      GTypeModule;
-typedef struct _GTypeModuleClass GTypeModuleClass;
-
-#define G_TYPE_TYPE_MODULE              (g_type_module_get_type ())
-#define G_TYPE_MODULE(module)           (G_TYPE_CHECK_INSTANCE_CAST ((module), G_TYPE_TYPE_MODULE, GTypeModule))
-#define G_TYPE_MODULE_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TYPE_MODULE, GTypeModuleClass))
-#define G_IS_TYPE_MODULE(module)        (G_TYPE_CHECK_INSTANCE_TYPE ((module), G_TYPE_TYPE_MODULE))
-#define G_IS_TYPE_MODULE_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TYPE_MODULE))
-#define G_TYPE_MODULE_GET_CLASS(module) (G_TYPE_INSTANCE_GET_CLASS ((module), G_TYPE_TYPE_MODULE, GTypeModuleClass))
-
-/**
- * GTypeModule:
- * @name: the name of the module
- * 
- * The members of the <structname>GTypeModule</structname> structure should not 
- * be accessed directly, except for the @name field.
- */
-struct _GTypeModule 
-{
-  GObject parent_instance;
-
-  guint use_count;
-  GSList *type_infos;
-  GSList *interface_infos;
-
-  /*< public >*/
-  gchar *name;
-};
-
-/**
- * GTypeModuleClass:
- * @parent_class: the parent class
- * @load: loads the module and registers one or more types using
- *  g_type_module_register_type().
- * @unload: unloads the module
- * 
- * In order to implement dynamic loading of types based on #GTypeModule, 
- * the @load and @unload functions in #GTypeModuleClass must be implemented.
- */
-struct _GTypeModuleClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-  gboolean (* load)   (GTypeModule *module);
-  void     (* unload) (GTypeModule *module);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*reserved1) (void);
-  void (*reserved2) (void);
-  void (*reserved3) (void);
-  void (*reserved4) (void);
-};
-
-/**
- * G_DEFINE_DYNAMIC_TYPE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * 
- * A convenience macro for dynamic type implementations, which declares a
- * class initialization function, an instance initialization function (see 
- * #GTypeInfo for information about these) and a static variable named 
- * @t_n<!-- -->_parent_class pointing to the parent class. Furthermore, 
- * it defines a <function>*_get_type()</function> and a static 
- * <function>*_register_type()</function> function for use in your
- * <function>module_init()</function>.
- * See G_DEFINE_DYNAMIC_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.14
- */
-#define G_DEFINE_DYNAMIC_TYPE(TN, t_n, T_P)          G_DEFINE_DYNAMIC_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-/**
- * G_DEFINE_DYNAMIC_TYPE_EXTENDED:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @TYPE_PARENT: The #GType of the parent type.
- * @flags: #GTypeFlags to pass to g_type_module_register_type()
- * @CODE: Custom code that gets inserted in the *_get_type() function.
- * 
- * A more general version of G_DEFINE_DYNAMIC_TYPE() which
- * allows to specify #GTypeFlags and custom code.
- * 
- * |[
- * G_DEFINE_DYNAMIC_TYPE_EXTENDED (GtkGadget,
- *                                 gtk_gadget,
- *                                 GTK_TYPE_THING,
- *                                 0,
- *                                 G_IMPLEMENT_INTERFACE_DYNAMIC (TYPE_GIZMO,
- *                                                                gtk_gadget_gizmo_init));
- * ]|
- * expands to
- * |[
- * static void     gtk_gadget_init              (GtkGadget      *self);
- * static void     gtk_gadget_class_init        (GtkGadgetClass *klass);
- * static void     gtk_gadget_class_finalize    (GtkGadgetClass *klass);
- * 
- * static gpointer gtk_gadget_parent_class = NULL;
- * static GType    gtk_gadget_type_id = 0;
- * 
- * static void     gtk_gadget_class_intern_init (gpointer klass)
- * {
- *   gtk_gadget_parent_class = g_type_class_peek_parent (klass); 
- *   gtk_gadget_class_init ((GtkGadgetClass*) klass); 
- * }
- * 
- * GType
- * gtk_gadget_get_type (void)
- * {
- *   return gtk_gadget_type_id;
- * }
- * 
- * static void
- * gtk_gadget_register_type (GTypeModule *type_module)
- * {
- *   const GTypeInfo g_define_type_info = {
- *     sizeof (GtkGadgetClass),
- *     (GBaseInitFunc) NULL,
- *     (GBaseFinalizeFunc) NULL,
- *     (GClassInitFunc) gtk_gadget_class_intern_init,
- *     (GClassFinalizeFunc) gtk_gadget_class_finalize,
- *     NULL,   // class_data
- *     sizeof (GtkGadget),
- *     0,      // n_preallocs
- *     (GInstanceInitFunc) gtk_gadget_init, 
- *     NULL    // value_table
- *   };
- *   gtk_gadget_type_id = g_type_module_register_type (type_module,
- *                                                     GTK_TYPE_THING,
- *                                                     "GtkGadget",
- *                                                     &g_define_type_info,
- *                                                     (GTypeFlags) flags);
- *   {
- *     const GInterfaceInfo g_implement_interface_info = {
- *       (GInterfaceInitFunc) gtk_gadget_gizmo_init
- *     };
- *     g_type_module_add_interface (type_module, g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
- *   }
- * }
- * ]|
- * 
- * Since: 2.14
- */
-#define G_DEFINE_DYNAMIC_TYPE_EXTENDED(TypeName, type_name, TYPE_PARENT, flags, CODE) \
-static void     type_name##_init              (TypeName        *self); \
-static void     type_name##_class_init        (TypeName##Class *klass); \
-static void     type_name##_class_finalize    (TypeName##Class *klass); \
-static gpointer type_name##_parent_class = NULL; \
-static GType    type_name##_type_id = 0; \
-static gint     TypeName##_private_offset; \
-\
-_G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
-\
-static inline gpointer \
-type_name##_get_instance_private (TypeName *self) \
-{ \
-  return (G_STRUCT_MEMBER_P (self, TypeName##_private_offset)); \
-} \
-\
-GType \
-type_name##_get_type (void) \
-{ \
-  return type_name##_type_id; \
-} \
-static void \
-type_name##_register_type (GTypeModule *type_module) \
-{ \
-  GType g_define_type_id G_GNUC_UNUSED; \
-  const GTypeInfo g_define_type_info = { \
-    sizeof (TypeName##Class), \
-    (GBaseInitFunc) NULL, \
-    (GBaseFinalizeFunc) NULL, \
-    (GClassInitFunc) type_name##_class_intern_init, \
-    (GClassFinalizeFunc) type_name##_class_finalize, \
-    NULL,   /* class_data */ \
-    sizeof (TypeName), \
-    0,      /* n_preallocs */ \
-    (GInstanceInitFunc) type_name##_init, \
-    NULL    /* value_table */ \
-  }; \
-  type_name##_type_id = g_type_module_register_type (type_module, \
-						     TYPE_PARENT, \
-						     #TypeName, \
-						     &g_define_type_info, \
-						     (GTypeFlags) flags); \
-  g_define_type_id = type_name##_type_id; \
-  { CODE ; } \
-}
-
-/**
- * G_IMPLEMENT_INTERFACE_DYNAMIC:
- * @TYPE_IFACE: The #GType of the interface to add
- * @iface_init: The interface init function
- *
- * A convenience macro to ease interface addition in the @_C_ section
- * of G_DEFINE_DYNAMIC_TYPE_EXTENDED(). See G_DEFINE_DYNAMIC_TYPE_EXTENDED()
- * for an example.
- *
- * Note that this macro can only be used together with the
- * G_DEFINE_DYNAMIC_TYPE_EXTENDED macros, since it depends on variable
- * names from that macro.
- *
- * Since: 2.24
- */
-#define G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init)       { \
-  const GInterfaceInfo g_implement_interface_info = { \
-    (GInterfaceInitFunc) iface_init, NULL, NULL      \
-  }; \
-  g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
-}
-
-#define G_ADD_PRIVATE_DYNAMIC(TypeName)         { \
-  TypeName##_private_offset = sizeof (TypeName##Private); \
-}
-
-GLIB_AVAILABLE_IN_ALL
-GType    g_type_module_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-gboolean g_type_module_use            (GTypeModule          *module);
-GLIB_AVAILABLE_IN_ALL
-void     g_type_module_unuse          (GTypeModule          *module);
-GLIB_AVAILABLE_IN_ALL
-void     g_type_module_set_name       (GTypeModule          *module,
-                                       const gchar          *name);
-GLIB_AVAILABLE_IN_ALL
-GType    g_type_module_register_type  (GTypeModule          *module,
-                                       GType                 parent_type,
-                                       const gchar          *type_name,
-                                       const GTypeInfo      *type_info,
-                                       GTypeFlags            flags);
-GLIB_AVAILABLE_IN_ALL
-void     g_type_module_add_interface  (GTypeModule          *module,
-                                       GType                 instance_type,
-                                       GType                 interface_type,
-                                       const GInterfaceInfo *interface_info);
-GLIB_AVAILABLE_IN_ALL
-GType    g_type_module_register_enum  (GTypeModule          *module,
-                                       const gchar          *name,
-                                       const GEnumValue     *const_static_values);
-GLIB_AVAILABLE_IN_ALL
-GType    g_type_module_register_flags (GTypeModule          *module,
-                                       const gchar          *name,
-                                       const GFlagsValue    *const_static_values);
-
-G_END_DECLS
-
-#endif /* __G_TYPE_MODULE_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gtypeplugin.h b/linux-x86/include/glib-2.0/gobject/gtypeplugin.h
deleted file mode 100644
index c744f9e..0000000
--- a/linux-x86/include/glib-2.0/gobject/gtypeplugin.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __G_TYPE_PLUGIN_H__
-#define __G_TYPE_PLUGIN_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include	<gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_TYPE_PLUGIN		(g_type_plugin_get_type ())
-#define G_TYPE_PLUGIN(inst)		(G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TYPE_PLUGIN, GTypePlugin))
-#define G_TYPE_PLUGIN_CLASS(vtable)	(G_TYPE_CHECK_CLASS_CAST ((vtable), G_TYPE_TYPE_PLUGIN, GTypePluginClass))
-#define G_IS_TYPE_PLUGIN(inst)		(G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TYPE_PLUGIN))
-#define G_IS_TYPE_PLUGIN_CLASS(vtable)	(G_TYPE_CHECK_CLASS_TYPE ((vtable), G_TYPE_TYPE_PLUGIN))
-#define G_TYPE_PLUGIN_GET_CLASS(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TYPE_PLUGIN, GTypePluginClass))
-
-
-/* --- typedefs & structures --- */
-typedef struct _GTypePluginClass		   GTypePluginClass;
-/**
- * GTypePluginUse:
- * @plugin: the #GTypePlugin whose use count should be increased
- * 
- * The type of the @use_plugin function of #GTypePluginClass, which gets called
- * to increase the use count of @plugin.
- */
-typedef void  (*GTypePluginUse)			  (GTypePlugin     *plugin);
-/**
- * GTypePluginUnuse:
- * @plugin: the #GTypePlugin whose use count should be decreased
- * 
- * The type of the @unuse_plugin function of #GTypePluginClass.
- */
-typedef void  (*GTypePluginUnuse)		  (GTypePlugin     *plugin);
-/**
- * GTypePluginCompleteTypeInfo:
- * @plugin: the #GTypePlugin
- * @g_type: the #GType whose info is completed
- * @info: the #GTypeInfo struct to fill in
- * @value_table: the #GTypeValueTable to fill in
- * 
- * The type of the @complete_type_info function of #GTypePluginClass.
- */
-typedef void  (*GTypePluginCompleteTypeInfo)	  (GTypePlugin     *plugin,
-						   GType            g_type,
-						   GTypeInfo       *info,
-						   GTypeValueTable *value_table);
-/**
- * GTypePluginCompleteInterfaceInfo:
- * @plugin: the #GTypePlugin
- * @instance_type: the #GType of an instantiable type to which the interface
- *  is added
- * @interface_type: the #GType of the interface whose info is completed
- * @info: the #GInterfaceInfo to fill in
- * 
- * The type of the @complete_interface_info function of #GTypePluginClass.
- */
-typedef void  (*GTypePluginCompleteInterfaceInfo) (GTypePlugin     *plugin,
-						   GType            instance_type,
-						   GType            interface_type,
-						   GInterfaceInfo  *info);
-/**
- * GTypePlugin:
- * 
- * The <structname>GTypePlugin</structname> typedef is used as a placeholder 
- * for objects that implement the <structname>GTypePlugin</structname> 
- * interface.
- */
-/**
- * GTypePluginClass:
- * @use_plugin: Increases the use count of the plugin.
- * @unuse_plugin: Decreases the use count of the plugin.
- * @complete_type_info: Fills in the #GTypeInfo and 
- *  #GTypeValueTable structs for the type. The structs are initialized
- *  with <literal>memset(s, 0, sizeof (s))</literal> before calling 
- *  this function.
- * @complete_interface_info: Fills in missing parts of the #GInterfaceInfo 
- *  for the interface. The structs is initialized with 
- *  <literal>memset(s, 0, sizeof (s))</literal> before calling
- *  this function.
- * 
- * The #GTypePlugin interface is used by the type system in order to handle
- * the lifecycle of dynamically loaded types.
- */
-struct _GTypePluginClass
-{
-  /*< private >*/
-  GTypeInterface		   base_iface;
-  
-  /*< public >*/
-  GTypePluginUse		   use_plugin;
-  GTypePluginUnuse		   unuse_plugin;
-  GTypePluginCompleteTypeInfo	   complete_type_info;
-  GTypePluginCompleteInterfaceInfo complete_interface_info;
-};
-
-
-/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
-GType	g_type_plugin_get_type			(void)	G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
-void	g_type_plugin_use			(GTypePlugin	 *plugin);
-GLIB_AVAILABLE_IN_ALL
-void	g_type_plugin_unuse			(GTypePlugin	 *plugin);
-GLIB_AVAILABLE_IN_ALL
-void	g_type_plugin_complete_type_info	(GTypePlugin     *plugin,
-						 GType            g_type,
-						 GTypeInfo       *info,
-						 GTypeValueTable *value_table);
-GLIB_AVAILABLE_IN_ALL
-void	g_type_plugin_complete_interface_info	(GTypePlugin     *plugin,
-						 GType            instance_type,
-						 GType            interface_type,
-						 GInterfaceInfo  *info);
-
-G_END_DECLS
-
-#endif /* __G_TYPE_PLUGIN_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gvalue.h b/linux-x86/include/glib-2.0/gobject/gvalue.h
deleted file mode 100644
index 56ea0c6..0000000
--- a/linux-x86/include/glib-2.0/gobject/gvalue.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvalue.h: generic GValue functions
- */
-#ifndef __G_VALUE_H__
-#define __G_VALUE_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include	<gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_IS_VALUE:
- * @type: A #GType value.
- * 
- * Checks whether the passed in type ID can be used for g_value_init().
- * That is, this macro checks whether this type provides an implementation
- * of the #GTypeValueTable functions required for a type to create a #GValue of.
- * 
- * Returns: Whether @type is suitable as a #GValue type.
- */
-#define	G_TYPE_IS_VALUE(type)		(g_type_check_is_value_type (type))
-/**
- * G_IS_VALUE:
- * @value: A #GValue structure.
- * 
- * Checks if @value is a valid and initialized #GValue structure.
- *
- * Returns: %TRUE on success.
- */
-#define	G_IS_VALUE(value)		(G_TYPE_CHECK_VALUE (value))
-/**
- * G_VALUE_TYPE:
- * @value: A #GValue structure.
- *
- * Get the type identifier of @value.
- *
- * Returns: the #GType.
- */
-#define	G_VALUE_TYPE(value)		(((GValue*) (value))->g_type)
-/**
- * G_VALUE_TYPE_NAME:
- * @value: A #GValue structure.
- *
- * Gets the type name of @value.
- *
- * Returns: the type name.
- */
-#define	G_VALUE_TYPE_NAME(value)	(g_type_name (G_VALUE_TYPE (value)))
-/**
- * G_VALUE_HOLDS:
- * @value: A #GValue structure.
- * @type: A #GType value.
- *
- * Checks if @value holds (or contains) a value of @type.
- * This macro will also check for @value != %NULL and issue a
- * warning if the check fails.
- *
- * Returns: %TRUE if @value holds the @type.
- */
-#define G_VALUE_HOLDS(value,type)	(G_TYPE_CHECK_VALUE_TYPE ((value), (type)))
-
-
-/* --- typedefs & structures --- */
-/**
- * GValueTransform:
- * @src_value: Source value.
- * @dest_value: Target value.
- * 
- * The type of value transformation functions which can be registered with
- * g_value_register_transform_func().
- */
-typedef void (*GValueTransform) (const GValue *src_value,
-				 GValue       *dest_value);
-/**
- * GValue:
- * 
- * An opaque structure used to hold different types of values.
- * The data within the structure has protected scope: it is accessible only
- * to functions within a #GTypeValueTable structure, or implementations of
- * the g_value_*() API. That is, code portions which implement new fundamental
- * types.
- * #GValue users cannot make any assumptions about how data is stored
- * within the 2 element @data union, and the @g_type member should
- * only be accessed through the G_VALUE_TYPE() macro.
- */
-struct _GValue
-{
-  /*< private >*/
-  GType		g_type;
-
-  /* public for GTypeValueTable methods */
-  union {
-    gint	v_int;
-    guint	v_uint;
-    glong	v_long;
-    gulong	v_ulong;
-    gint64      v_int64;
-    guint64     v_uint64;
-    gfloat	v_float;
-    gdouble	v_double;
-    gpointer	v_pointer;
-  } data[2];
-};
-
-
-/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
-GValue*         g_value_init	   	(GValue       *value,
-					 GType         g_type);
-GLIB_AVAILABLE_IN_ALL
-void            g_value_copy    	(const GValue *src_value,
-					 GValue       *dest_value);
-GLIB_AVAILABLE_IN_ALL
-GValue*         g_value_reset   	(GValue       *value);
-GLIB_AVAILABLE_IN_ALL
-void            g_value_unset   	(GValue       *value);
-GLIB_AVAILABLE_IN_ALL
-void		g_value_set_instance	(GValue	      *value,
-					 gpointer      instance);
-
-
-/* --- private --- */
-GLIB_AVAILABLE_IN_ALL
-gboolean	g_value_fits_pointer	(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-gpointer	g_value_peek_pointer	(const GValue *value);
-
-
-/* --- implementation details --- */
-GLIB_AVAILABLE_IN_ALL
-gboolean g_value_type_compatible	(GType		 src_type,
-					 GType		 dest_type);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_value_type_transformable	(GType           src_type,
-					 GType           dest_type);
-GLIB_AVAILABLE_IN_ALL
-gboolean g_value_transform		(const GValue   *src_value,
-					 GValue         *dest_value);
-GLIB_AVAILABLE_IN_ALL
-void	g_value_register_transform_func	(GType		 src_type,
-					 GType		 dest_type,
-					 GValueTransform transform_func);
-
-/**
- * G_VALUE_NOCOPY_CONTENTS:
- *
- * If passed to G_VALUE_COLLECT(), allocated data won't be copied
- * but used verbatim. This does not affect ref-counted types like
- * objects.
- */
-#define G_VALUE_NOCOPY_CONTENTS (1 << 27)
-
-/**
- * G_VALUE_INIT:
- *
- * A #GValue must be initialized before it can be used.
- * This macro can be used as initializer instead of an explicit
- * <literal>{ 0 }</literal> when declaring a variable,
- * but it cannot be assigned to a variable.
- *
- * |[
- *   GValue value = G_VALUE_INIT;
- * ]|
- *
- * Since: 2.30
- */
-#define G_VALUE_INIT  { 0, { { 0 } } }
-
-
-G_END_DECLS
-
-#endif /* __G_VALUE_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gvaluearray.h b/linux-x86/include/glib-2.0/gobject/gvaluearray.h
deleted file mode 100644
index aca3716..0000000
--- a/linux-x86/include/glib-2.0/gobject/gvaluearray.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvaluearray.h: GLib array type holding GValues
- */
-#ifndef __G_VALUE_ARRAY_H__
-#define __G_VALUE_ARRAY_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TYPE_VALUE_ARRAY:
- *
- * The type ID of the "GValueArray" type which is a boxed type,
- * used to pass around pointers to GValueArrays.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define G_TYPE_VALUE_ARRAY (g_value_array_get_type ())
-
-/* --- typedefs & structs --- */
-typedef struct _GValueArray GValueArray;
-/**
- * GValueArray:
- * @n_values: number of values contained in the array
- * @values: array of values
- * 
- * A #GValueArray contains an array of #GValue elements.
- */
-struct _GValueArray
-{
-  guint   n_values;
-  GValue *values;
-
-  /*< private >*/
-  guint   n_prealloced;
-};
-
-/* --- prototypes --- */
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-GType           g_value_array_get_type       (void) G_GNUC_CONST;
-
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-GValue*		g_value_array_get_nth	     (GValueArray	*value_array,
-					      guint		 index_);
-
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-GValueArray*	g_value_array_new	     (guint		 n_prealloced);
-
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-void		g_value_array_free	     (GValueArray	*value_array);
-
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-GValueArray*	g_value_array_copy	     (const GValueArray *value_array);
-
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-GValueArray*	g_value_array_prepend	     (GValueArray	*value_array,
-					      const GValue	*value);
-
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-GValueArray*	g_value_array_append	     (GValueArray	*value_array,
-					      const GValue	*value);
-
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-GValueArray*	g_value_array_insert	     (GValueArray	*value_array,
-					      guint		 index_,
-					      const GValue	*value);
-
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-GValueArray*	g_value_array_remove	     (GValueArray	*value_array,
-					      guint		 index_);
-
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-GValueArray*	g_value_array_sort	     (GValueArray	*value_array,
-					      GCompareFunc	 compare_func);
-
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
-GValueArray*	g_value_array_sort_with_data (GValueArray	*value_array,
-					      GCompareDataFunc	 compare_func,
-					      gpointer		 user_data);
-
-
-G_END_DECLS
-
-#endif /* __G_VALUE_ARRAY_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gvaluecollector.h b/linux-x86/include/glib-2.0/gobject/gvaluecollector.h
deleted file mode 100644
index 05a436a..0000000
--- a/linux-x86/include/glib-2.0/gobject/gvaluecollector.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvaluecollector.h: GValue varargs stubs
- */
-/**
- * SECTION:value_collection
- * @Short_description: Converting varargs to generic values
- * @Title: Varargs Value Collection
- * 
- * The macros in this section provide the varargs parsing support needed
- * in variadic GObject functions such as g_object_new() or g_object_set().
- * They currently support the collection of integral types, floating point 
- * types and pointers.
- */
-#ifndef __G_VALUE_COLLECTOR_H__
-#define __G_VALUE_COLLECTOR_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* we may want to add aggregate types here some day, if requested
- * by users. the basic C types are covered already, everything
- * smaller than an int is promoted to an integer and floats are
- * always promoted to doubles for varargs call constructions.
- */
-enum	/*< skip >*/
-{
-  G_VALUE_COLLECT_INT		= 'i',
-  G_VALUE_COLLECT_LONG		= 'l',
-  G_VALUE_COLLECT_INT64         = 'q',
-  G_VALUE_COLLECT_DOUBLE	= 'd',
-  G_VALUE_COLLECT_POINTER	= 'p'
-};
-
-
-/* vararg union holding actual values collected
- */
-/**
- * GTypeCValue:
- * @v_int: the field for holding integer values
- * @v_long: the field for holding long integer values
- * @v_int64: the field for holding 64 bit integer values
- * @v_double: the field for holding floating point values
- * @v_pointer: the field for holding pointers
- * 
- * A union holding one collected value.
- */
-union _GTypeCValue
-{
-  gint     v_int;
-  glong    v_long;
-  gint64   v_int64;
-  gdouble  v_double;
-  gpointer v_pointer;
-};
-
-/**
- * G_VALUE_COLLECT_INIT:
- * @value: a #GValue return location. @value must contain only 0 bytes.
- * @_value_type: the #GType to use for @value.
- * @var_args: the va_list variable; it may be evaluated multiple times
- * @flags: flags which are passed on to the collect_value() function of
- *  the #GTypeValueTable of @value.
- * @__error: a #gchar** variable that will be modified to hold a g_new()
- *  allocated error messages if something fails
- * 
- * Collects a variable argument value from a va_list. We have to
- * implement the varargs collection as a macro, because on some systems
- * va_list variables cannot be passed by reference.
- *
- * Since: 2.24
- */
-#define G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error)		\
-G_STMT_START {										\
-  GValue *_val = (value);								\
-  guint _flags = (flags);								\
-  GTypeValueTable *_vtab = g_type_value_table_peek (_value_type);			\
-  const gchar *_collect_format = _vtab->collect_format;					\
-  GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
-  guint _n_values = 0;									\
-                                                                                        \
-  _val->g_type = _value_type;		/* value_meminit() from gvalue.c */		\
-  while (*_collect_format)								\
-    {											\
-      GTypeCValue *_cvalue = _cvalues + _n_values++;					\
-                                                                                        \
-      switch (*_collect_format++)							\
-	{										\
-	case G_VALUE_COLLECT_INT:							\
-	  _cvalue->v_int = va_arg ((var_args), gint);					\
-	  break;									\
-	case G_VALUE_COLLECT_LONG:							\
-	  _cvalue->v_long = va_arg ((var_args), glong);					\
-	  break;									\
-	case G_VALUE_COLLECT_INT64:							\
-	  _cvalue->v_int64 = va_arg ((var_args), gint64);				\
-	  break;									\
-	case G_VALUE_COLLECT_DOUBLE:							\
-	  _cvalue->v_double = va_arg ((var_args), gdouble);				\
-	  break;									\
-	case G_VALUE_COLLECT_POINTER:							\
-	  _cvalue->v_pointer = va_arg ((var_args), gpointer);				\
-	  break;									\
-	default:									\
-	  g_assert_not_reached ();							\
-	}										\
-    }											\
-  *(__error) = _vtab->collect_value (_val,						\
-				       _n_values,					\
-				       _cvalues,					\
-				       _flags);						\
-} G_STMT_END
-
-/**
- * G_VALUE_COLLECT:
- * @value: a #GValue return location. @value is supposed to be initialized
- *  according to the value type to be collected
- * @var_args: the va_list variable; it may be evaluated multiple times
- * @flags: flags which are passed on to the collect_value() function of
- *  the #GTypeValueTable of @value.
- * @__error: a #gchar** variable that will be modified to hold a g_new()
- *  allocated error messages if something fails
- *
- * Collects a variable argument value from a va_list. We have to
- * implement the varargs collection as a macro, because on some systems
- * va_list variables cannot be passed by reference.
- *
- * Note: If you are creating the @value argument just before calling this macro,
- * you should use the #G_VALUE_COLLECT_INIT variant and pass the unitialized
- * #GValue. That variant is faster than #G_VALUE_COLLECT.
- */
-#define G_VALUE_COLLECT(value, var_args, flags, __error) G_STMT_START {			\
-  GValue *_value = (value);								\
-  GType _value_type = G_VALUE_TYPE (_value);						\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-											\
-  if (_vtable->value_free)								\
-    _vtable->value_free (_value);							\
-  memset (_value->data, 0, sizeof (_value->data));					\
-											\
-  G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error);			\
-} G_STMT_END
-
-#define G_VALUE_COLLECT_SKIP(_value_type, var_args)					\
-G_STMT_START {										\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  const gchar *_collect_format = _vtable->collect_format;				\
-                                                                                        \
-  while (*_collect_format)								\
-    {											\
-      switch (*_collect_format++)							\
-	{										\
-	case G_VALUE_COLLECT_INT:							\
-	  va_arg ((var_args), gint);							\
-	  break;									\
-	case G_VALUE_COLLECT_LONG:							\
-	  va_arg ((var_args), glong);							\
-	  break;									\
-	case G_VALUE_COLLECT_INT64:							\
-	  va_arg ((var_args), gint64);							\
-	  break;									\
-	case G_VALUE_COLLECT_DOUBLE:							\
-	  va_arg ((var_args), gdouble);							\
-	  break;									\
-	case G_VALUE_COLLECT_POINTER:							\
-	  va_arg ((var_args), gpointer);						\
-	  break;									\
-	default:									\
-	  g_assert_not_reached ();							\
-	}										\
-    }											\
-} G_STMT_END
-
-/**
- * G_VALUE_LCOPY:
- * @value: a #GValue return location. @value is supposed to be initialized 
- *  according to the value type to be collected
- * @var_args: the va_list variable; it may be evaluated multiple times
- * @flags: flags which are passed on to the lcopy_value() function of
- *  the #GTypeValueTable of @value.
- * @__error: a #gchar** variable that will be modified to hold a g_new()
- *  allocated error messages if something fails
- * 
- * Collects a value's variable argument locations from a va_list. Usage is
- * analogous to G_VALUE_COLLECT().
- */
-#define G_VALUE_LCOPY(value, var_args, flags, __error)					\
-G_STMT_START {										\
-  const GValue *_value = (value);							\
-  guint _flags = (flags);								\
-  GType _value_type = G_VALUE_TYPE (_value);						\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  const gchar *_lcopy_format = _vtable->lcopy_format;					\
-  GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
-  guint _n_values = 0;									\
-                                                                                        \
-  while (*_lcopy_format)								\
-    {											\
-      GTypeCValue *_cvalue = _cvalues + _n_values++;					\
-                                                                                        \
-      switch (*_lcopy_format++)								\
-	{										\
-	case G_VALUE_COLLECT_INT:							\
-	  _cvalue->v_int = va_arg ((var_args), gint);					\
-	  break;									\
-	case G_VALUE_COLLECT_LONG:							\
-	  _cvalue->v_long = va_arg ((var_args), glong);					\
-	  break;									\
-	case G_VALUE_COLLECT_INT64:							\
-	  _cvalue->v_int64 = va_arg ((var_args), gint64);				\
-	  break;									\
-	case G_VALUE_COLLECT_DOUBLE:							\
-	  _cvalue->v_double = va_arg ((var_args), gdouble);				\
-	  break;									\
-	case G_VALUE_COLLECT_POINTER:							\
-	  _cvalue->v_pointer = va_arg ((var_args), gpointer);				\
-	  break;									\
-	default:									\
-	  g_assert_not_reached ();							\
-	}										\
-    }											\
-  *(__error) = _vtable->lcopy_value (_value,						\
-				     _n_values,						\
-				     _cvalues,						\
-				     _flags);						\
-} G_STMT_END
-
-
-/**
- * G_VALUE_COLLECT_FORMAT_MAX_LENGTH:
- * 
- * The maximal number of #GTypeCValue<!-- -->s which can be collected for a 
- * single #GValue.
- */
-#define	G_VALUE_COLLECT_FORMAT_MAX_LENGTH	(8)
-
-G_END_DECLS
-
-#endif /* __G_VALUE_COLLECTOR_H__ */
diff --git a/linux-x86/include/glib-2.0/gobject/gvaluetypes.h b/linux-x86/include/glib-2.0/gobject/gvaluetypes.h
deleted file mode 100644
index 5fb42ad..0000000
--- a/linux-x86/include/glib-2.0/gobject/gvaluetypes.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvaluetypes.h: GLib default values
- */
-#ifndef __G_VALUETYPES_H__
-#define __G_VALUETYPES_H__
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_VALUE_HOLDS_CHAR:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_CHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_CHAR(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_CHAR))
-/**
- * G_VALUE_HOLDS_UCHAR:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_UCHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_UCHAR(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UCHAR))
-/**
- * G_VALUE_HOLDS_BOOLEAN:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_BOOLEAN.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_BOOLEAN(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_BOOLEAN))
-/**
- * G_VALUE_HOLDS_INT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_INT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_INT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_INT))
-/**
- * G_VALUE_HOLDS_UINT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_UINT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_UINT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UINT))
-/**
- * G_VALUE_HOLDS_LONG:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_LONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_LONG(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_LONG))
-/**
- * G_VALUE_HOLDS_ULONG:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_ULONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_ULONG(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_ULONG))
-/**
- * G_VALUE_HOLDS_INT64:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_INT64.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_INT64(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_INT64))
-/**
- * G_VALUE_HOLDS_UINT64:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_UINT64.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_UINT64(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UINT64))
-/**
- * G_VALUE_HOLDS_FLOAT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_FLOAT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_FLOAT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_FLOAT))
-/**
- * G_VALUE_HOLDS_DOUBLE:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_DOUBLE.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_DOUBLE(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_DOUBLE))
-/**
- * G_VALUE_HOLDS_STRING:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_STRING.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_STRING(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_STRING))
-/**
- * G_VALUE_HOLDS_POINTER:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_POINTER.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_POINTER(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_POINTER))
-/**
- * G_TYPE_GTYPE:
- * 
- * The type for #GType.
- */
-#define	G_TYPE_GTYPE			 (g_gtype_get_type())
-/**
- * G_VALUE_HOLDS_GTYPE:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_GTYPE.
- * 
- * Since: 2.12
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_GTYPE(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_GTYPE))
-/**
- * G_VALUE_HOLDS_VARIANT:
- * @value: a valid #GValue structure
- *
- * Checks whether the given #GValue can hold values of type %G_TYPE_VARIANT.
- *
- * Returns: %TRUE on success.
- *
- * Since: 2.26
- */
-#define G_VALUE_HOLDS_VARIANT(value)     (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_VARIANT))
-
-
-/* --- prototypes --- */
-GLIB_DEPRECATED_IN_2_32_FOR(g_value_set_schar)
-void                  g_value_set_char          (GValue       *value,
-                                                 gchar         v_char);
-GLIB_DEPRECATED_IN_2_32_FOR(g_value_get_schar)
-gchar                 g_value_get_char          (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_schar		(GValue	      *value,
-						 gint8	       v_char);
-GLIB_AVAILABLE_IN_ALL
-gint8		      g_value_get_schar		(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_uchar		(GValue	      *value,
-						 guchar	       v_uchar);
-GLIB_AVAILABLE_IN_ALL
-guchar		      g_value_get_uchar		(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_boolean	(GValue	      *value,
-						 gboolean      v_boolean);
-GLIB_AVAILABLE_IN_ALL
-gboolean	      g_value_get_boolean	(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_int		(GValue	      *value,
-						 gint	       v_int);
-GLIB_AVAILABLE_IN_ALL
-gint		      g_value_get_int		(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_uint		(GValue	      *value,
-						 guint	       v_uint);
-GLIB_AVAILABLE_IN_ALL
-guint		      g_value_get_uint		(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_long		(GValue	      *value,
-						 glong	       v_long);
-GLIB_AVAILABLE_IN_ALL
-glong		      g_value_get_long		(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_ulong		(GValue	      *value,
-						 gulong	       v_ulong);
-GLIB_AVAILABLE_IN_ALL
-gulong		      g_value_get_ulong		(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_int64		(GValue	      *value,
-						 gint64	       v_int64);
-GLIB_AVAILABLE_IN_ALL
-gint64		      g_value_get_int64		(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_uint64	(GValue	      *value,
-						 guint64      v_uint64);
-GLIB_AVAILABLE_IN_ALL
-guint64		      g_value_get_uint64	(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_float		(GValue	      *value,
-						 gfloat	       v_float);
-GLIB_AVAILABLE_IN_ALL
-gfloat		      g_value_get_float		(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_double	(GValue	      *value,
-						 gdouble       v_double);
-GLIB_AVAILABLE_IN_ALL
-gdouble		      g_value_get_double	(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_string	(GValue	      *value,
-						 const gchar  *v_string);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_static_string (GValue	      *value,
-						 const gchar  *v_string);
-GLIB_AVAILABLE_IN_ALL
-const gchar *         g_value_get_string	(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-gchar*		      g_value_dup_string	(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_pointer	(GValue	      *value,
-						 gpointer      v_pointer);
-GLIB_AVAILABLE_IN_ALL
-gpointer	      g_value_get_pointer	(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-GType		      g_gtype_get_type		(void);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_gtype	        (GValue	      *value,
-						 GType         v_gtype);
-GLIB_AVAILABLE_IN_ALL
-GType	              g_value_get_gtype	        (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_set_variant	(GValue	      *value,
-						 GVariant     *variant);
-GLIB_AVAILABLE_IN_ALL
-void		      g_value_take_variant	(GValue	      *value,
-						 GVariant     *variant);
-GLIB_AVAILABLE_IN_ALL
-GVariant*	      g_value_get_variant	(const GValue *value);
-GLIB_AVAILABLE_IN_ALL
-GVariant*	      g_value_dup_variant	(const GValue *value);
-
-
-/* Convenience for registering new pointer types */
-GLIB_AVAILABLE_IN_ALL
-GType                 g_pointer_type_register_static (const gchar *name);
-
-/* debugging aid, describe value contents as string */
-GLIB_AVAILABLE_IN_ALL
-gchar*                g_strdup_value_contents   (const GValue *value);
-
-
-GLIB_AVAILABLE_IN_ALL
-void g_value_take_string		        (GValue		   *value,
-						 gchar		   *v_string);
-GLIB_DEPRECATED_FOR(g_value_take_string)
-void g_value_set_string_take_ownership          (GValue            *value,
-                                                 gchar             *v_string);
-
-
-/* humpf, need a C representable type name for G_TYPE_STRING */
-/**
- * gchararray:
- * 
- * A C representable type name for #G_TYPE_STRING.
- */
-typedef gchar* gchararray;
-
-
-G_END_DECLS
-
-#endif /* __G_VALUETYPES_H__ */
diff --git a/linux-x86/include/libfdt.h b/linux-x86/include/libfdt.h
deleted file mode 100644
index 02baa84..0000000
--- a/linux-x86/include/libfdt.h
+++ /dev/null
@@ -1,1514 +0,0 @@
-#ifndef _LIBFDT_H
-#define _LIBFDT_H
-/*
- * libfdt - Flat Device Tree manipulation
- * Copyright (C) 2006 David Gibson, IBM Corporation.
- *
- * libfdt is dual licensed: you can use it either under the terms of
- * the GPL, or the BSD license, at your option.
- *
- *  a) This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
- *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- *     MA 02110-1301 USA
- *
- * Alternatively,
- *
- *  b) Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *     2. Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <libfdt_env.h>
-#include <fdt.h>
-
-#define FDT_FIRST_SUPPORTED_VERSION	0x10
-#define FDT_LAST_SUPPORTED_VERSION	0x11
-
-/* Error codes: informative error codes */
-#define FDT_ERR_NOTFOUND	1
-	/* FDT_ERR_NOTFOUND: The requested node or property does not exist */
-#define FDT_ERR_EXISTS		2
-	/* FDT_ERR_EXISTS: Attemped to create a node or property which
-	 * already exists */
-#define FDT_ERR_NOSPACE		3
-	/* FDT_ERR_NOSPACE: Operation needed to expand the device
-	 * tree, but its buffer did not have sufficient space to
-	 * contain the expanded tree. Use fdt_open_into() to move the
-	 * device tree to a buffer with more space. */
-
-/* Error codes: codes for bad parameters */
-#define FDT_ERR_BADOFFSET	4
-	/* FDT_ERR_BADOFFSET: Function was passed a structure block
-	 * offset which is out-of-bounds, or which points to an
-	 * unsuitable part of the structure for the operation. */
-#define FDT_ERR_BADPATH		5
-	/* FDT_ERR_BADPATH: Function was passed a badly formatted path
-	 * (e.g. missing a leading / for a function which requires an
-	 * absolute path) */
-#define FDT_ERR_BADPHANDLE	6
-	/* FDT_ERR_BADPHANDLE: Function was passed an invalid phandle
-	 * value.  phandle values of 0 and -1 are not permitted. */
-#define FDT_ERR_BADSTATE	7
-	/* FDT_ERR_BADSTATE: Function was passed an incomplete device
-	 * tree created by the sequential-write functions, which is
-	 * not sufficiently complete for the requested operation. */
-
-/* Error codes: codes for bad device tree blobs */
-#define FDT_ERR_TRUNCATED	8
-	/* FDT_ERR_TRUNCATED: Structure block of the given device tree
-	 * ends without an FDT_END tag. */
-#define FDT_ERR_BADMAGIC	9
-	/* FDT_ERR_BADMAGIC: Given "device tree" appears not to be a
-	 * device tree at all - it is missing the flattened device
-	 * tree magic number. */
-#define FDT_ERR_BADVERSION	10
-	/* FDT_ERR_BADVERSION: Given device tree has a version which
-	 * can't be handled by the requested operation.  For
-	 * read-write functions, this may mean that fdt_open_into() is
-	 * required to convert the tree to the expected version. */
-#define FDT_ERR_BADSTRUCTURE	11
-	/* FDT_ERR_BADSTRUCTURE: Given device tree has a corrupt
-	 * structure block or other serious error (e.g. misnested
-	 * nodes, or subnodes preceding properties). */
-#define FDT_ERR_BADLAYOUT	12
-	/* FDT_ERR_BADLAYOUT: For read-write functions, the given
-	 * device tree has it's sub-blocks in an order that the
-	 * function can't handle (memory reserve map, then structure,
-	 * then strings).  Use fdt_open_into() to reorganize the tree
-	 * into a form suitable for the read-write operations. */
-
-/* "Can't happen" error indicating a bug in libfdt */
-#define FDT_ERR_INTERNAL	13
-	/* FDT_ERR_INTERNAL: libfdt has failed an internal assertion.
-	 * Should never be returned, if it is, it indicates a bug in
-	 * libfdt itself. */
-
-#define FDT_ERR_MAX		13
-
-/**********************************************************************/
-/* Low-level functions (you probably don't need these)                */
-/**********************************************************************/
-
-const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int checklen);
-static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)
-{
-	return (void *)(uintptr_t)fdt_offset_ptr(fdt, offset, checklen);
-}
-
-uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset);
-
-/**********************************************************************/
-/* Traversal functions                                                */
-/**********************************************************************/
-
-int fdt_next_node(const void *fdt, int offset, int *depth);
-
-/**
- * fdt_first_subnode() - get offset of first direct subnode
- *
- * @fdt:	FDT blob
- * @offset:	Offset of node to check
- * @return offset of first subnode, or -FDT_ERR_NOTFOUND if there is none
- */
-int fdt_first_subnode(const void *fdt, int offset);
-
-/**
- * fdt_next_subnode() - get offset of next direct subnode
- *
- * After first calling fdt_first_subnode(), call this function repeatedly to
- * get direct subnodes of a parent node.
- *
- * @fdt:	FDT blob
- * @offset:	Offset of previous subnode
- * @return offset of next subnode, or -FDT_ERR_NOTFOUND if there are no more
- * subnodes
- */
-int fdt_next_subnode(const void *fdt, int offset);
-
-/**********************************************************************/
-/* General functions                                                  */
-/**********************************************************************/
-
-#define fdt_get_header(fdt, field) \
-	(fdt32_to_cpu(((const struct fdt_header *)(fdt))->field))
-#define fdt_magic(fdt) 			(fdt_get_header(fdt, magic))
-#define fdt_totalsize(fdt)		(fdt_get_header(fdt, totalsize))
-#define fdt_off_dt_struct(fdt)		(fdt_get_header(fdt, off_dt_struct))
-#define fdt_off_dt_strings(fdt)		(fdt_get_header(fdt, off_dt_strings))
-#define fdt_off_mem_rsvmap(fdt)		(fdt_get_header(fdt, off_mem_rsvmap))
-#define fdt_version(fdt)		(fdt_get_header(fdt, version))
-#define fdt_last_comp_version(fdt) 	(fdt_get_header(fdt, last_comp_version))
-#define fdt_boot_cpuid_phys(fdt) 	(fdt_get_header(fdt, boot_cpuid_phys))
-#define fdt_size_dt_strings(fdt) 	(fdt_get_header(fdt, size_dt_strings))
-#define fdt_size_dt_struct(fdt)		(fdt_get_header(fdt, size_dt_struct))
-
-#define __fdt_set_hdr(name) \
-	static inline void fdt_set_##name(void *fdt, uint32_t val) \
-	{ \
-		struct fdt_header *fdth = (struct fdt_header*)fdt; \
-		fdth->name = cpu_to_fdt32(val); \
-	}
-__fdt_set_hdr(magic);
-__fdt_set_hdr(totalsize);
-__fdt_set_hdr(off_dt_struct);
-__fdt_set_hdr(off_dt_strings);
-__fdt_set_hdr(off_mem_rsvmap);
-__fdt_set_hdr(version);
-__fdt_set_hdr(last_comp_version);
-__fdt_set_hdr(boot_cpuid_phys);
-__fdt_set_hdr(size_dt_strings);
-__fdt_set_hdr(size_dt_struct);
-#undef __fdt_set_hdr
-
-/**
- * fdt_check_header - sanity check a device tree or possible device tree
- * @fdt: pointer to data which might be a flattened device tree
- *
- * fdt_check_header() checks that the given buffer contains what
- * appears to be a flattened device tree with sane information in its
- * header.
- *
- * returns:
- *     0, if the buffer appears to contain a valid device tree
- *     -FDT_ERR_BADMAGIC,
- *     -FDT_ERR_BADVERSION,
- *     -FDT_ERR_BADSTATE, standard meanings, as above
- */
-int fdt_check_header(const void *fdt);
-
-/**
- * fdt_move - move a device tree around in memory
- * @fdt: pointer to the device tree to move
- * @buf: pointer to memory where the device is to be moved
- * @bufsize: size of the memory space at buf
- *
- * fdt_move() relocates, if possible, the device tree blob located at
- * fdt to the buffer at buf of size bufsize.  The buffer may overlap
- * with the existing device tree blob at fdt.  Therefore,
- *     fdt_move(fdt, fdt, fdt_totalsize(fdt))
- * should always succeed.
- *
- * returns:
- *     0, on success
- *     -FDT_ERR_NOSPACE, bufsize is insufficient to contain the device tree
- *     -FDT_ERR_BADMAGIC,
- *     -FDT_ERR_BADVERSION,
- *     -FDT_ERR_BADSTATE, standard meanings
- */
-int fdt_move(const void *fdt, void *buf, int bufsize);
-
-/**********************************************************************/
-/* Read-only functions                                                */
-/**********************************************************************/
-
-/**
- * fdt_string - retrieve a string from the strings block of a device tree
- * @fdt: pointer to the device tree blob
- * @stroffset: offset of the string within the strings block (native endian)
- *
- * fdt_string() retrieves a pointer to a single string from the
- * strings block of the device tree blob at fdt.
- *
- * returns:
- *     a pointer to the string, on success
- *     NULL, if stroffset is out of bounds
- */
-const char *fdt_string(const void *fdt, int stroffset);
-
-/**
- * fdt_num_mem_rsv - retrieve the number of memory reserve map entries
- * @fdt: pointer to the device tree blob
- *
- * Returns the number of entries in the device tree blob's memory
- * reservation map.  This does not include the terminating 0,0 entry
- * or any other (0,0) entries reserved for expansion.
- *
- * returns:
- *     the number of entries
- */
-int fdt_num_mem_rsv(const void *fdt);
-
-/**
- * fdt_get_mem_rsv - retrieve one memory reserve map entry
- * @fdt: pointer to the device tree blob
- * @address, @size: pointers to 64-bit variables
- *
- * On success, *address and *size will contain the address and size of
- * the n-th reserve map entry from the device tree blob, in
- * native-endian format.
- *
- * returns:
- *     0, on success
- *     -FDT_ERR_BADMAGIC,
- *     -FDT_ERR_BADVERSION,
- *     -FDT_ERR_BADSTATE, standard meanings
- */
-int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size);
-
-/**
- * fdt_subnode_offset_namelen - find a subnode based on substring
- * @fdt: pointer to the device tree blob
- * @parentoffset: structure block offset of a node
- * @name: name of the subnode to locate
- * @namelen: number of characters of name to consider
- *
- * Identical to fdt_subnode_offset(), but only examine the first
- * namelen characters of name for matching the subnode name.  This is
- * useful for finding subnodes based on a portion of a larger string,
- * such as a full path.
- */
-int fdt_subnode_offset_namelen(const void *fdt, int parentoffset,
-			       const char *name, int namelen);
-/**
- * fdt_subnode_offset - find a subnode of a given node
- * @fdt: pointer to the device tree blob
- * @parentoffset: structure block offset of a node
- * @name: name of the subnode to locate
- *
- * fdt_subnode_offset() finds a subnode of the node at structure block
- * offset parentoffset with the given name.  name may include a unit
- * address, in which case fdt_subnode_offset() will find the subnode
- * with that unit address, or the unit address may be omitted, in
- * which case fdt_subnode_offset() will find an arbitrary subnode
- * whose name excluding unit address matches the given name.
- *
- * returns:
- *	structure block offset of the requested subnode (>=0), on success
- *	-FDT_ERR_NOTFOUND, if the requested subnode does not exist
- *	-FDT_ERR_BADOFFSET, if parentoffset did not point to an FDT_BEGIN_NODE tag
- *      -FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings.
- */
-int fdt_subnode_offset(const void *fdt, int parentoffset, const char *name);
-
-/**
- * fdt_path_offset - find a tree node by its full path
- * @fdt: pointer to the device tree blob
- * @path: full path of the node to locate
- *
- * fdt_path_offset() finds a node of a given path in the device tree.
- * Each path component may omit the unit address portion, but the
- * results of this are undefined if any such path component is
- * ambiguous (that is if there are multiple nodes at the relevant
- * level matching the given component, differentiated only by unit
- * address).
- *
- * returns:
- *	structure block offset of the node with the requested path (>=0), on success
- *	-FDT_ERR_BADPATH, given path does not begin with '/' or is invalid
- *	-FDT_ERR_NOTFOUND, if the requested node does not exist
- *      -FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings.
- */
-int fdt_path_offset(const void *fdt, const char *path);
-
-/**
- * fdt_get_name - retrieve the name of a given node
- * @fdt: pointer to the device tree blob
- * @nodeoffset: structure block offset of the starting node
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * fdt_get_name() retrieves the name (including unit address) of the
- * device tree node at structure block offset nodeoffset.  If lenp is
- * non-NULL, the length of this name is also returned, in the integer
- * pointed to by lenp.
- *
- * returns:
- *	pointer to the node's name, on success
- *		If lenp is non-NULL, *lenp contains the length of that name (>=0)
- *	NULL, on error
- *		if lenp is non-NULL *lenp contains an error code (<0):
- *		-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *		-FDT_ERR_BADMAGIC,
- *		-FDT_ERR_BADVERSION,
- *		-FDT_ERR_BADSTATE, standard meanings
- */
-const char *fdt_get_name(const void *fdt, int nodeoffset, int *lenp);
-
-/**
- * fdt_first_property_offset - find the offset of a node's first property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: structure block offset of a node
- *
- * fdt_first_property_offset() finds the first property of the node at
- * the given structure block offset.
- *
- * returns:
- *	structure block offset of the property (>=0), on success
- *	-FDT_ERR_NOTFOUND, if the requested node has no properties
- *	-FDT_ERR_BADOFFSET, if nodeoffset did not point to an FDT_BEGIN_NODE tag
- *      -FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings.
- */
-int fdt_first_property_offset(const void *fdt, int nodeoffset);
-
-/**
- * fdt_next_property_offset - step through a node's properties
- * @fdt: pointer to the device tree blob
- * @offset: structure block offset of a property
- *
- * fdt_next_property_offset() finds the property immediately after the
- * one at the given structure block offset.  This will be a property
- * of the same node as the given property.
- *
- * returns:
- *	structure block offset of the next property (>=0), on success
- *	-FDT_ERR_NOTFOUND, if the given property is the last in its node
- *	-FDT_ERR_BADOFFSET, if nodeoffset did not point to an FDT_PROP tag
- *      -FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings.
- */
-int fdt_next_property_offset(const void *fdt, int offset);
-
-/**
- * fdt_get_property_by_offset - retrieve the property at a given offset
- * @fdt: pointer to the device tree blob
- * @offset: offset of the property to retrieve
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * fdt_get_property_by_offset() retrieves a pointer to the
- * fdt_property structure within the device tree blob at the given
- * offset.  If lenp is non-NULL, the length of the property value is
- * also returned, in the integer pointed to by lenp.
- *
- * returns:
- *	pointer to the structure representing the property
- *		if lenp is non-NULL, *lenp contains the length of the property
- *		value (>=0)
- *	NULL, on error
- *		if lenp is non-NULL, *lenp contains an error code (<0):
- *		-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_PROP tag
- *		-FDT_ERR_BADMAGIC,
- *		-FDT_ERR_BADVERSION,
- *		-FDT_ERR_BADSTATE,
- *		-FDT_ERR_BADSTRUCTURE,
- *		-FDT_ERR_TRUNCATED, standard meanings
- */
-const struct fdt_property *fdt_get_property_by_offset(const void *fdt,
-						      int offset,
-						      int *lenp);
-
-/**
- * fdt_get_property_namelen - find a property based on substring
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to find
- * @name: name of the property to find
- * @namelen: number of characters of name to consider
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * Identical to fdt_get_property_namelen(), but only examine the first
- * namelen characters of name for matching the property name.
- */
-const struct fdt_property *fdt_get_property_namelen(const void *fdt,
-						    int nodeoffset,
-						    const char *name,
-						    int namelen, int *lenp);
-
-/**
- * fdt_get_property - find a given property in a given node
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to find
- * @name: name of the property to find
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * fdt_get_property() retrieves a pointer to the fdt_property
- * structure within the device tree blob corresponding to the property
- * named 'name' of the node at offset nodeoffset.  If lenp is
- * non-NULL, the length of the property value is also returned, in the
- * integer pointed to by lenp.
- *
- * returns:
- *	pointer to the structure representing the property
- *		if lenp is non-NULL, *lenp contains the length of the property
- *		value (>=0)
- *	NULL, on error
- *		if lenp is non-NULL, *lenp contains an error code (<0):
- *		-FDT_ERR_NOTFOUND, node does not have named property
- *		-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *		-FDT_ERR_BADMAGIC,
- *		-FDT_ERR_BADVERSION,
- *		-FDT_ERR_BADSTATE,
- *		-FDT_ERR_BADSTRUCTURE,
- *		-FDT_ERR_TRUNCATED, standard meanings
- */
-const struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset,
-					    const char *name, int *lenp);
-static inline struct fdt_property *fdt_get_property_w(void *fdt, int nodeoffset,
-						      const char *name,
-						      int *lenp)
-{
-	return (struct fdt_property *)(uintptr_t)
-		fdt_get_property(fdt, nodeoffset, name, lenp);
-}
-
-/**
- * fdt_getprop_by_offset - retrieve the value of a property at a given offset
- * @fdt: pointer to the device tree blob
- * @ffset: offset of the property to read
- * @namep: pointer to a string variable (will be overwritten) or NULL
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * fdt_getprop_by_offset() retrieves a pointer to the value of the
- * property at structure block offset 'offset' (this will be a pointer
- * to within the device blob itself, not a copy of the value).  If
- * lenp is non-NULL, the length of the property value is also
- * returned, in the integer pointed to by lenp.  If namep is non-NULL,
- * the property's namne will also be returned in the char * pointed to
- * by namep (this will be a pointer to within the device tree's string
- * block, not a new copy of the name).
- *
- * returns:
- *	pointer to the property's value
- *		if lenp is non-NULL, *lenp contains the length of the property
- *		value (>=0)
- *		if namep is non-NULL *namep contiains a pointer to the property
- *		name.
- *	NULL, on error
- *		if lenp is non-NULL, *lenp contains an error code (<0):
- *		-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_PROP tag
- *		-FDT_ERR_BADMAGIC,
- *		-FDT_ERR_BADVERSION,
- *		-FDT_ERR_BADSTATE,
- *		-FDT_ERR_BADSTRUCTURE,
- *		-FDT_ERR_TRUNCATED, standard meanings
- */
-const void *fdt_getprop_by_offset(const void *fdt, int offset,
-				  const char **namep, int *lenp);
-
-/**
- * fdt_getprop_namelen - get property value based on substring
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to find
- * @name: name of the property to find
- * @namelen: number of characters of name to consider
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * Identical to fdt_getprop(), but only examine the first namelen
- * characters of name for matching the property name.
- */
-const void *fdt_getprop_namelen(const void *fdt, int nodeoffset,
-				const char *name, int namelen, int *lenp);
-
-/**
- * fdt_getprop - retrieve the value of a given property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to find
- * @name: name of the property to find
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * fdt_getprop() retrieves a pointer to the value of the property
- * named 'name' of the node at offset nodeoffset (this will be a
- * pointer to within the device blob itself, not a copy of the value).
- * If lenp is non-NULL, the length of the property value is also
- * returned, in the integer pointed to by lenp.
- *
- * returns:
- *	pointer to the property's value
- *		if lenp is non-NULL, *lenp contains the length of the property
- *		value (>=0)
- *	NULL, on error
- *		if lenp is non-NULL, *lenp contains an error code (<0):
- *		-FDT_ERR_NOTFOUND, node does not have named property
- *		-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *		-FDT_ERR_BADMAGIC,
- *		-FDT_ERR_BADVERSION,
- *		-FDT_ERR_BADSTATE,
- *		-FDT_ERR_BADSTRUCTURE,
- *		-FDT_ERR_TRUNCATED, standard meanings
- */
-const void *fdt_getprop(const void *fdt, int nodeoffset,
-			const char *name, int *lenp);
-static inline void *fdt_getprop_w(void *fdt, int nodeoffset,
-				  const char *name, int *lenp)
-{
-	return (void *)(uintptr_t)fdt_getprop(fdt, nodeoffset, name, lenp);
-}
-
-/**
- * fdt_get_phandle - retrieve the phandle of a given node
- * @fdt: pointer to the device tree blob
- * @nodeoffset: structure block offset of the node
- *
- * fdt_get_phandle() retrieves the phandle of the device tree node at
- * structure block offset nodeoffset.
- *
- * returns:
- *	the phandle of the node at nodeoffset, on success (!= 0, != -1)
- *	0, if the node has no phandle, or another error occurs
- */
-uint32_t fdt_get_phandle(const void *fdt, int nodeoffset);
-
-/**
- * fdt_get_alias_namelen - get alias based on substring
- * @fdt: pointer to the device tree blob
- * @name: name of the alias th look up
- * @namelen: number of characters of name to consider
- *
- * Identical to fdt_get_alias(), but only examine the first namelen
- * characters of name for matching the alias name.
- */
-const char *fdt_get_alias_namelen(const void *fdt,
-				  const char *name, int namelen);
-
-/**
- * fdt_get_alias - retreive the path referenced by a given alias
- * @fdt: pointer to the device tree blob
- * @name: name of the alias th look up
- *
- * fdt_get_alias() retrieves the value of a given alias.  That is, the
- * value of the property named 'name' in the node /aliases.
- *
- * returns:
- *	a pointer to the expansion of the alias named 'name', if it exists
- *	NULL, if the given alias or the /aliases node does not exist
- */
-const char *fdt_get_alias(const void *fdt, const char *name);
-
-/**
- * fdt_get_path - determine the full path of a node
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose path to find
- * @buf: character buffer to contain the returned path (will be overwritten)
- * @buflen: size of the character buffer at buf
- *
- * fdt_get_path() computes the full path of the node at offset
- * nodeoffset, and records that path in the buffer at buf.
- *
- * NOTE: This function is expensive, as it must scan the device tree
- * structure from the start to nodeoffset.
- *
- * returns:
- *	0, on success
- *		buf contains the absolute path of the node at
- *		nodeoffset, as a NUL-terminated string.
- * 	-FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
- *	-FDT_ERR_NOSPACE, the path of the given node is longer than (bufsize-1)
- *		characters and will not fit in the given buffer.
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE, standard meanings
- */
-int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen);
-
-/**
- * fdt_supernode_atdepth_offset - find a specific ancestor of a node
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose parent to find
- * @supernodedepth: depth of the ancestor to find
- * @nodedepth: pointer to an integer variable (will be overwritten) or NULL
- *
- * fdt_supernode_atdepth_offset() finds an ancestor of the given node
- * at a specific depth from the root (where the root itself has depth
- * 0, its immediate subnodes depth 1 and so forth).  So
- *	fdt_supernode_atdepth_offset(fdt, nodeoffset, 0, NULL);
- * will always return 0, the offset of the root node.  If the node at
- * nodeoffset has depth D, then:
- *	fdt_supernode_atdepth_offset(fdt, nodeoffset, D, NULL);
- * will return nodeoffset itself.
- *
- * NOTE: This function is expensive, as it must scan the device tree
- * structure from the start to nodeoffset.
- *
- * returns:
-
- *	structure block offset of the node at node offset's ancestor
- *		of depth supernodedepth (>=0), on success
- * 	-FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
-*	-FDT_ERR_NOTFOUND, supernodedepth was greater than the depth of nodeoffset
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE, standard meanings
- */
-int fdt_supernode_atdepth_offset(const void *fdt, int nodeoffset,
-				 int supernodedepth, int *nodedepth);
-
-/**
- * fdt_node_depth - find the depth of a given node
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose parent to find
- *
- * fdt_node_depth() finds the depth of a given node.  The root node
- * has depth 0, its immediate subnodes depth 1 and so forth.
- *
- * NOTE: This function is expensive, as it must scan the device tree
- * structure from the start to nodeoffset.
- *
- * returns:
- *	depth of the node at nodeoffset (>=0), on success
- * 	-FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE, standard meanings
- */
-int fdt_node_depth(const void *fdt, int nodeoffset);
-
-/**
- * fdt_parent_offset - find the parent of a given node
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose parent to find
- *
- * fdt_parent_offset() locates the parent node of a given node (that
- * is, it finds the offset of the node which contains the node at
- * nodeoffset as a subnode).
- *
- * NOTE: This function is expensive, as it must scan the device tree
- * structure from the start to nodeoffset, *twice*.
- *
- * returns:
- *	structure block offset of the parent of the node at nodeoffset
- *		(>=0), on success
- * 	-FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE, standard meanings
- */
-int fdt_parent_offset(const void *fdt, int nodeoffset);
-
-/**
- * fdt_node_offset_by_prop_value - find nodes with a given property value
- * @fdt: pointer to the device tree blob
- * @startoffset: only find nodes after this offset
- * @propname: property name to check
- * @propval: property value to search for
- * @proplen: length of the value in propval
- *
- * fdt_node_offset_by_prop_value() returns the offset of the first
- * node after startoffset, which has a property named propname whose
- * value is of length proplen and has value equal to propval; or if
- * startoffset is -1, the very first such node in the tree.
- *
- * To iterate through all nodes matching the criterion, the following
- * idiom can be used:
- *	offset = fdt_node_offset_by_prop_value(fdt, -1, propname,
- *					       propval, proplen);
- *	while (offset != -FDT_ERR_NOTFOUND) {
- *		// other code here
- *		offset = fdt_node_offset_by_prop_value(fdt, offset, propname,
- *						       propval, proplen);
- *	}
- *
- * Note the -1 in the first call to the function, if 0 is used here
- * instead, the function will never locate the root node, even if it
- * matches the criterion.
- *
- * returns:
- *	structure block offset of the located node (>= 0, >startoffset),
- *		 on success
- *	-FDT_ERR_NOTFOUND, no node matching the criterion exists in the
- *		tree after startoffset
- * 	-FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE, standard meanings
- */
-int fdt_node_offset_by_prop_value(const void *fdt, int startoffset,
-				  const char *propname,
-				  const void *propval, int proplen);
-
-/**
- * fdt_node_offset_by_phandle - find the node with a given phandle
- * @fdt: pointer to the device tree blob
- * @phandle: phandle value
- *
- * fdt_node_offset_by_phandle() returns the offset of the node
- * which has the given phandle value.  If there is more than one node
- * in the tree with the given phandle (an invalid tree), results are
- * undefined.
- *
- * returns:
- *	structure block offset of the located node (>= 0), on success
- *	-FDT_ERR_NOTFOUND, no node with that phandle exists
- *	-FDT_ERR_BADPHANDLE, given phandle value was invalid (0 or -1)
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE, standard meanings
- */
-int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle);
-
-/**
- * fdt_node_check_compatible: check a node's compatible property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of a tree node
- * @compatible: string to match against
- *
- *
- * fdt_node_check_compatible() returns 0 if the given node contains a
- * 'compatible' property with the given string as one of its elements,
- * it returns non-zero otherwise, or on error.
- *
- * returns:
- *	0, if the node has a 'compatible' property listing the given string
- *	1, if the node has a 'compatible' property, but it does not list
- *		the given string
- *	-FDT_ERR_NOTFOUND, if the given node has no 'compatible' property
- * 	-FDT_ERR_BADOFFSET, if nodeoffset does not refer to a BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE, standard meanings
- */
-int fdt_node_check_compatible(const void *fdt, int nodeoffset,
-			      const char *compatible);
-
-/**
- * fdt_node_offset_by_compatible - find nodes with a given 'compatible' value
- * @fdt: pointer to the device tree blob
- * @startoffset: only find nodes after this offset
- * @compatible: 'compatible' string to match against
- *
- * fdt_node_offset_by_compatible() returns the offset of the first
- * node after startoffset, which has a 'compatible' property which
- * lists the given compatible string; or if startoffset is -1, the
- * very first such node in the tree.
- *
- * To iterate through all nodes matching the criterion, the following
- * idiom can be used:
- *	offset = fdt_node_offset_by_compatible(fdt, -1, compatible);
- *	while (offset != -FDT_ERR_NOTFOUND) {
- *		// other code here
- *		offset = fdt_node_offset_by_compatible(fdt, offset, compatible);
- *	}
- *
- * Note the -1 in the first call to the function, if 0 is used here
- * instead, the function will never locate the root node, even if it
- * matches the criterion.
- *
- * returns:
- *	structure block offset of the located node (>= 0, >startoffset),
- *		 on success
- *	-FDT_ERR_NOTFOUND, no node matching the criterion exists in the
- *		tree after startoffset
- * 	-FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE, standard meanings
- */
-int fdt_node_offset_by_compatible(const void *fdt, int startoffset,
-				  const char *compatible);
-
-/**
- * fdt_stringlist_contains - check a string list property for a string
- * @strlist: Property containing a list of strings to check
- * @listlen: Length of property
- * @str: String to search for
- *
- * This is a utility function provided for convenience. The list contains
- * one or more strings, each terminated by \0, as is found in a device tree
- * "compatible" property.
- *
- * @return: 1 if the string is found in the list, 0 not found, or invalid list
- */
-int fdt_stringlist_contains(const char *strlist, int listlen, const char *str);
-
-/**********************************************************************/
-/* Write-in-place functions                                           */
-/**********************************************************************/
-
-/**
- * fdt_setprop_inplace - change a property's value, but not its size
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: pointer to data to replace the property value with
- * @len: length of the property value
- *
- * fdt_setprop_inplace() replaces the value of a given property with
- * the data in val, of length len.  This function cannot change the
- * size of a property, and so will only work if len is equal to the
- * current length of the property.
- *
- * This function will alter only the bytes in the blob which contain
- * the given property value, and will not alter or move any other part
- * of the tree.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, if len is not equal to the property's current length
- *	-FDT_ERR_NOTFOUND, node does not have the named property
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
-			const void *val, int len);
-
-/**
- * fdt_setprop_inplace_u32 - change the value of a 32-bit integer property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: 32-bit integer value to replace the property with
- *
- * fdt_setprop_inplace_u32() replaces the value of a given property
- * with the 32-bit integer value in val, converting val to big-endian
- * if necessary.  This function cannot change the size of a property,
- * and so will only work if the property already exists and has length
- * 4.
- *
- * This function will alter only the bytes in the blob which contain
- * the given property value, and will not alter or move any other part
- * of the tree.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, if the property's length is not equal to 4
- *	-FDT_ERR_NOTFOUND, node does not have the named property
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-static inline int fdt_setprop_inplace_u32(void *fdt, int nodeoffset,
-					  const char *name, uint32_t val)
-{
-	fdt32_t tmp = cpu_to_fdt32(val);
-	return fdt_setprop_inplace(fdt, nodeoffset, name, &tmp, sizeof(tmp));
-}
-
-/**
- * fdt_setprop_inplace_u64 - change the value of a 64-bit integer property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: 64-bit integer value to replace the property with
- *
- * fdt_setprop_inplace_u64() replaces the value of a given property
- * with the 64-bit integer value in val, converting val to big-endian
- * if necessary.  This function cannot change the size of a property,
- * and so will only work if the property already exists and has length
- * 8.
- *
- * This function will alter only the bytes in the blob which contain
- * the given property value, and will not alter or move any other part
- * of the tree.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, if the property's length is not equal to 8
- *	-FDT_ERR_NOTFOUND, node does not have the named property
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-static inline int fdt_setprop_inplace_u64(void *fdt, int nodeoffset,
-					  const char *name, uint64_t val)
-{
-	fdt64_t tmp = cpu_to_fdt64(val);
-	return fdt_setprop_inplace(fdt, nodeoffset, name, &tmp, sizeof(tmp));
-}
-
-/**
- * fdt_setprop_inplace_cell - change the value of a single-cell property
- *
- * This is an alternative name for fdt_setprop_inplace_u32()
- */
-static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset,
-					   const char *name, uint32_t val)
-{
-	return fdt_setprop_inplace_u32(fdt, nodeoffset, name, val);
-}
-
-/**
- * fdt_nop_property - replace a property with nop tags
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to nop
- * @name: name of the property to nop
- *
- * fdt_nop_property() will replace a given property's representation
- * in the blob with FDT_NOP tags, effectively removing it from the
- * tree.
- *
- * This function will alter only the bytes in the blob which contain
- * the property, and will not alter or move any other part of the
- * tree.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOTFOUND, node does not have the named property
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-int fdt_nop_property(void *fdt, int nodeoffset, const char *name);
-
-/**
- * fdt_nop_node - replace a node (subtree) with nop tags
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node to nop
- *
- * fdt_nop_node() will replace a given node's representation in the
- * blob, including all its subnodes, if any, with FDT_NOP tags,
- * effectively removing it from the tree.
- *
- * This function will alter only the bytes in the blob which contain
- * the node and its properties and subnodes, and will not alter or
- * move any other part of the tree.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-int fdt_nop_node(void *fdt, int nodeoffset);
-
-/**********************************************************************/
-/* Sequential write functions                                         */
-/**********************************************************************/
-
-int fdt_create(void *buf, int bufsize);
-int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size);
-int fdt_finish_reservemap(void *fdt);
-int fdt_begin_node(void *fdt, const char *name);
-int fdt_property(void *fdt, const char *name, const void *val, int len);
-static inline int fdt_property_u32(void *fdt, const char *name, uint32_t val)
-{
-	fdt32_t tmp = cpu_to_fdt32(val);
-	return fdt_property(fdt, name, &tmp, sizeof(tmp));
-}
-static inline int fdt_property_u64(void *fdt, const char *name, uint64_t val)
-{
-	fdt64_t tmp = cpu_to_fdt64(val);
-	return fdt_property(fdt, name, &tmp, sizeof(tmp));
-}
-static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)
-{
-	return fdt_property_u32(fdt, name, val);
-}
-#define fdt_property_string(fdt, name, str) \
-	fdt_property(fdt, name, str, strlen(str)+1)
-int fdt_end_node(void *fdt);
-int fdt_finish(void *fdt);
-
-/**********************************************************************/
-/* Read-write functions                                               */
-/**********************************************************************/
-
-int fdt_create_empty_tree(void *buf, int bufsize);
-int fdt_open_into(const void *fdt, void *buf, int bufsize);
-int fdt_pack(void *fdt);
-
-/**
- * fdt_add_mem_rsv - add one memory reserve map entry
- * @fdt: pointer to the device tree blob
- * @address, @size: 64-bit values (native endian)
- *
- * Adds a reserve map entry to the given blob reserving a region at
- * address address of length size.
- *
- * This function will insert data into the reserve map and will
- * therefore change the indexes of some entries in the table.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *		contain the new reservation entry
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size);
-
-/**
- * fdt_del_mem_rsv - remove a memory reserve map entry
- * @fdt: pointer to the device tree blob
- * @n: entry to remove
- *
- * fdt_del_mem_rsv() removes the n-th memory reserve map entry from
- * the blob.
- *
- * This function will delete data from the reservation table and will
- * therefore change the indexes of some entries in the table.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOTFOUND, there is no entry of the given index (i.e. there
- *		are less than n+1 reserve map entries)
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-int fdt_del_mem_rsv(void *fdt, int n);
-
-/**
- * fdt_set_name - change the name of a given node
- * @fdt: pointer to the device tree blob
- * @nodeoffset: structure block offset of a node
- * @name: name to give the node
- *
- * fdt_set_name() replaces the name (including unit address, if any)
- * of the given node with the given string.  NOTE: this function can't
- * efficiently check if the new name is unique amongst the given
- * node's siblings; results are undefined if this function is invoked
- * with a name equal to one of the given node's siblings.
- *
- * This function may insert or delete data from the blob, and will
- * therefore change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob
- *		to contain the new name
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE, standard meanings
- */
-int fdt_set_name(void *fdt, int nodeoffset, const char *name);
-
-/**
- * fdt_setprop - create or change a property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: pointer to data to set the property value to
- * @len: length of the property value
- *
- * fdt_setprop() sets the value of the named property in the given
- * node to the given value and length, creating the property if it
- * does not already exist.
- *
- * This function may insert or delete data from the blob, and will
- * therefore change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *		contain the new property value
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-int fdt_setprop(void *fdt, int nodeoffset, const char *name,
-		const void *val, int len);
-
-/**
- * fdt_setprop_u32 - set a property to a 32-bit integer
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: 32-bit integer value for the property (native endian)
- *
- * fdt_setprop_u32() sets the value of the named property in the given
- * node to the given 32-bit integer value (converting to big-endian if
- * necessary), or creates a new property with that value if it does
- * not already exist.
- *
- * This function may insert or delete data from the blob, and will
- * therefore change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *		contain the new property value
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-static inline int fdt_setprop_u32(void *fdt, int nodeoffset, const char *name,
-				  uint32_t val)
-{
-	fdt32_t tmp = cpu_to_fdt32(val);
-	return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp));
-}
-
-/**
- * fdt_setprop_u64 - set a property to a 64-bit integer
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: 64-bit integer value for the property (native endian)
- *
- * fdt_setprop_u64() sets the value of the named property in the given
- * node to the given 64-bit integer value (converting to big-endian if
- * necessary), or creates a new property with that value if it does
- * not already exist.
- *
- * This function may insert or delete data from the blob, and will
- * therefore change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *		contain the new property value
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-static inline int fdt_setprop_u64(void *fdt, int nodeoffset, const char *name,
-				  uint64_t val)
-{
-	fdt64_t tmp = cpu_to_fdt64(val);
-	return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp));
-}
-
-/**
- * fdt_setprop_cell - set a property to a single cell value
- *
- * This is an alternative name for fdt_setprop_u32()
- */
-static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name,
-				   uint32_t val)
-{
-	return fdt_setprop_u32(fdt, nodeoffset, name, val);
-}
-
-/**
- * fdt_setprop_string - set a property to a string value
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @str: string value for the property
- *
- * fdt_setprop_string() sets the value of the named property in the
- * given node to the given string value (using the length of the
- * string to determine the new length of the property), or creates a
- * new property with that value if it does not already exist.
- *
- * This function may insert or delete data from the blob, and will
- * therefore change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *		contain the new property value
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-#define fdt_setprop_string(fdt, nodeoffset, name, str) \
-	fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)
-
-/**
- * fdt_appendprop - append to or create a property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to append to
- * @val: pointer to data to append to the property value
- * @len: length of the data to append to the property value
- *
- * fdt_appendprop() appends the value to the named property in the
- * given node, creating the property if it does not already exist.
- *
- * This function may insert data into the blob, and will therefore
- * change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *		contain the new property value
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-int fdt_appendprop(void *fdt, int nodeoffset, const char *name,
-		   const void *val, int len);
-
-/**
- * fdt_appendprop_u32 - append a 32-bit integer value to a property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: 32-bit integer value to append to the property (native endian)
- *
- * fdt_appendprop_u32() appends the given 32-bit integer value
- * (converting to big-endian if necessary) to the value of the named
- * property in the given node, or creates a new property with that
- * value if it does not already exist.
- *
- * This function may insert data into the blob, and will therefore
- * change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *		contain the new property value
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-static inline int fdt_appendprop_u32(void *fdt, int nodeoffset,
-				     const char *name, uint32_t val)
-{
-	fdt32_t tmp = cpu_to_fdt32(val);
-	return fdt_appendprop(fdt, nodeoffset, name, &tmp, sizeof(tmp));
-}
-
-/**
- * fdt_appendprop_u64 - append a 64-bit integer value to a property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: 64-bit integer value to append to the property (native endian)
- *
- * fdt_appendprop_u64() appends the given 64-bit integer value
- * (converting to big-endian if necessary) to the value of the named
- * property in the given node, or creates a new property with that
- * value if it does not already exist.
- *
- * This function may insert data into the blob, and will therefore
- * change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *		contain the new property value
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-static inline int fdt_appendprop_u64(void *fdt, int nodeoffset,
-				     const char *name, uint64_t val)
-{
-	fdt64_t tmp = cpu_to_fdt64(val);
-	return fdt_appendprop(fdt, nodeoffset, name, &tmp, sizeof(tmp));
-}
-
-/**
- * fdt_appendprop_cell - append a single cell value to a property
- *
- * This is an alternative name for fdt_appendprop_u32()
- */
-static inline int fdt_appendprop_cell(void *fdt, int nodeoffset,
-				      const char *name, uint32_t val)
-{
-	return fdt_appendprop_u32(fdt, nodeoffset, name, val);
-}
-
-/**
- * fdt_appendprop_string - append a string to a property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @str: string value to append to the property
- *
- * fdt_appendprop_string() appends the given string to the value of
- * the named property in the given node, or creates a new property
- * with that value if it does not already exist.
- *
- * This function may insert data into the blob, and will therefore
- * change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *		contain the new property value
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-#define fdt_appendprop_string(fdt, nodeoffset, name, str) \
-	fdt_appendprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)
-
-/**
- * fdt_delprop - delete a property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to nop
- * @name: name of the property to nop
- *
- * fdt_del_property() will delete the given property.
- *
- * This function will delete data from the blob, and will therefore
- * change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_NOTFOUND, node does not have the named property
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-int fdt_delprop(void *fdt, int nodeoffset, const char *name);
-
-/**
- * fdt_add_subnode_namelen - creates a new node based on substring
- * @fdt: pointer to the device tree blob
- * @parentoffset: structure block offset of a node
- * @name: name of the subnode to locate
- * @namelen: number of characters of name to consider
- *
- * Identical to fdt_add_subnode(), but use only the first namelen
- * characters of name as the name of the new node.  This is useful for
- * creating subnodes based on a portion of a larger string, such as a
- * full path.
- */
-int fdt_add_subnode_namelen(void *fdt, int parentoffset,
-			    const char *name, int namelen);
-
-/**
- * fdt_add_subnode - creates a new node
- * @fdt: pointer to the device tree blob
- * @parentoffset: structure block offset of a node
- * @name: name of the subnode to locate
- *
- * fdt_add_subnode() creates a new node as a subnode of the node at
- * structure block offset parentoffset, with the given name (which
- * should include the unit address, if any).
- *
- * This function will insert data into the blob, and will therefore
- * change the offsets of some existing nodes.
-
- * returns:
- *	structure block offset of the created nodeequested subnode (>=0), on success
- *	-FDT_ERR_NOTFOUND, if the requested subnode does not exist
- *	-FDT_ERR_BADOFFSET, if parentoffset did not point to an FDT_BEGIN_NODE tag
- *	-FDT_ERR_EXISTS, if the node at parentoffset already has a subnode of
- *		the given name
- *	-FDT_ERR_NOSPACE, if there is insufficient free space in the
- *		blob to contain the new node
- *	-FDT_ERR_NOSPACE
- *	-FDT_ERR_BADLAYOUT
- *      -FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings.
- */
-int fdt_add_subnode(void *fdt, int parentoffset, const char *name);
-
-/**
- * fdt_del_node - delete a node (subtree)
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node to nop
- *
- * fdt_del_node() will remove the given node, including all its
- * subnodes if any, from the blob.
- *
- * This function will delete data from the blob, and will therefore
- * change the offsets of some existing nodes.
- *
- * returns:
- *	0, on success
- *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *	-FDT_ERR_BADLAYOUT,
- *	-FDT_ERR_BADMAGIC,
- *	-FDT_ERR_BADVERSION,
- *	-FDT_ERR_BADSTATE,
- *	-FDT_ERR_BADSTRUCTURE,
- *	-FDT_ERR_TRUNCATED, standard meanings
- */
-int fdt_del_node(void *fdt, int nodeoffset);
-
-/**********************************************************************/
-/* Debugging / informational functions                                */
-/**********************************************************************/
-
-const char *fdt_strerror(int errval);
-
-#endif /* _LIBFDT_H */
diff --git a/linux-x86/include/libfdt_env.h b/linux-x86/include/libfdt_env.h
deleted file mode 100644
index 9dea97d..0000000
--- a/linux-x86/include/libfdt_env.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#ifndef _LIBFDT_ENV_H
-#define _LIBFDT_ENV_H
-/*
- * libfdt - Flat Device Tree manipulation
- * Copyright (C) 2006 David Gibson, IBM Corporation.
- * Copyright 2012 Kim Phillips, Freescale Semiconductor.
- *
- * libfdt is dual licensed: you can use it either under the terms of
- * the GPL, or the BSD license, at your option.
- *
- *  a) This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
- *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- *     MA 02110-1301 USA
- *
- * Alternatively,
- *
- *  b) Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *     2. Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#ifdef __CHECKER__
-#define __force __attribute__((force))
-#define __bitwise __attribute__((bitwise))
-#else
-#define __force
-#define __bitwise
-#endif
-
-typedef uint16_t __bitwise fdt16_t;
-typedef uint32_t __bitwise fdt32_t;
-typedef uint64_t __bitwise fdt64_t;
-
-#define EXTRACT_BYTE(x, n)	((unsigned long long)((uint8_t *)&x)[n])
-#define CPU_TO_FDT16(x) ((EXTRACT_BYTE(x, 0) << 8) | EXTRACT_BYTE(x, 1))
-#define CPU_TO_FDT32(x) ((EXTRACT_BYTE(x, 0) << 24) | (EXTRACT_BYTE(x, 1) << 16) | \
-			 (EXTRACT_BYTE(x, 2) << 8) | EXTRACT_BYTE(x, 3))
-#define CPU_TO_FDT64(x) ((EXTRACT_BYTE(x, 0) << 56) | (EXTRACT_BYTE(x, 1) << 48) | \
-			 (EXTRACT_BYTE(x, 2) << 40) | (EXTRACT_BYTE(x, 3) << 32) | \
-			 (EXTRACT_BYTE(x, 4) << 24) | (EXTRACT_BYTE(x, 5) << 16) | \
-			 (EXTRACT_BYTE(x, 6) << 8) | EXTRACT_BYTE(x, 7))
-
-static inline uint16_t fdt16_to_cpu(fdt16_t x)
-{
-	return (__force uint16_t)CPU_TO_FDT16(x);
-}
-static inline fdt16_t cpu_to_fdt16(uint16_t x)
-{
-	return (__force fdt16_t)CPU_TO_FDT16(x);
-}
-
-static inline uint32_t fdt32_to_cpu(fdt32_t x)
-{
-	return (__force uint32_t)CPU_TO_FDT32(x);
-}
-static inline fdt32_t cpu_to_fdt32(uint32_t x)
-{
-	return (__force fdt32_t)CPU_TO_FDT32(x);
-}
-
-static inline uint64_t fdt64_to_cpu(fdt64_t x)
-{
-	return (__force uint64_t)CPU_TO_FDT64(x);
-}
-static inline fdt64_t cpu_to_fdt64(uint64_t x)
-{
-	return (__force fdt64_t)CPU_TO_FDT64(x);
-}
-#undef CPU_TO_FDT64
-#undef CPU_TO_FDT32
-#undef CPU_TO_FDT16
-#undef EXTRACT_BYTE
-
-#endif /* _LIBFDT_ENV_H */
diff --git a/linux-x86/include/libfdt_internal.h b/linux-x86/include/libfdt_internal.h
deleted file mode 100644
index 381133b..0000000
--- a/linux-x86/include/libfdt_internal.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef _LIBFDT_INTERNAL_H
-#define _LIBFDT_INTERNAL_H
-/*
- * libfdt - Flat Device Tree manipulation
- * Copyright (C) 2006 David Gibson, IBM Corporation.
- *
- * libfdt is dual licensed: you can use it either under the terms of
- * the GPL, or the BSD license, at your option.
- *
- *  a) This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
- *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- *     MA 02110-1301 USA
- *
- * Alternatively,
- *
- *  b) Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *     2. Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include <fdt.h>
-
-#define FDT_ALIGN(x, a)		(((x) + (a) - 1) & ~((a) - 1))
-#define FDT_TAGALIGN(x)		(FDT_ALIGN((x), FDT_TAGSIZE))
-
-#define FDT_CHECK_HEADER(fdt) \
-	{ \
-		int err; \
-		if ((err = fdt_check_header(fdt)) != 0) \
-			return err; \
-	}
-
-int _fdt_check_node_offset(const void *fdt, int offset);
-int _fdt_check_prop_offset(const void *fdt, int offset);
-const char *_fdt_find_string(const char *strtab, int tabsize, const char *s);
-int _fdt_node_end_offset(void *fdt, int nodeoffset);
-
-static inline const void *_fdt_offset_ptr(const void *fdt, int offset)
-{
-	return (const char *)fdt + fdt_off_dt_struct(fdt) + offset;
-}
-
-static inline void *_fdt_offset_ptr_w(void *fdt, int offset)
-{
-	return (void *)(uintptr_t)_fdt_offset_ptr(fdt, offset);
-}
-
-static inline const struct fdt_reserve_entry *_fdt_mem_rsv(const void *fdt, int n)
-{
-	const struct fdt_reserve_entry *rsv_table =
-		(const struct fdt_reserve_entry *)
-		((const char *)fdt + fdt_off_mem_rsvmap(fdt));
-
-	return rsv_table + n;
-}
-static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int n)
-{
-	return (void *)(uintptr_t)_fdt_mem_rsv(fdt, n);
-}
-
-#define FDT_SW_MAGIC		(~FDT_MAGIC)
-
-#endif /* _LIBFDT_INTERNAL_H */
diff --git a/linux-x86/include/libpng16/png.h b/linux-x86/include/libpng16/png.h
deleted file mode 100644
index 997130d..0000000
--- a/linux-x86/include/libpng16/png.h
+++ /dev/null
@@ -1,3282 +0,0 @@
-
-/* png.h - header file for PNG reference library
- *
- * libpng version 1.6.16, December 22, 2014
- * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license (See LICENSE, below)
- *
- * Authors and maintainers:
- *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
- *   libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.6.16, December 22, 2014: Glenn
- *   See also "Contributing Authors", below.
- *
- * Note about libpng version numbers:
- *
- *   Due to various miscommunications, unforeseen code incompatibilities
- *   and occasional factors outside the authors' control, version numbering
- *   on the library has not always been consistent and straightforward.
- *   The following table summarizes matters since version 0.89c, which was
- *   the first widely used release:
- *
- *    source                 png.h  png.h  shared-lib
- *    version                string   int  version
- *    -------                ------ -----  ----------
- *    0.89c "1.0 beta 3"     0.89      89  1.0.89
- *    0.90  "1.0 beta 4"     0.90      90  0.90  [should have been 2.0.90]
- *    0.95  "1.0 beta 5"     0.95      95  0.95  [should have been 2.0.95]
- *    0.96  "1.0 beta 6"     0.96      96  0.96  [should have been 2.0.96]
- *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 [should have been 2.0.97]
- *    0.97c                  0.97      97  2.0.97
- *    0.98                   0.98      98  2.0.98
- *    0.99                   0.99      98  2.0.99
- *    0.99a-m                0.99      99  2.0.99
- *    1.00                   1.00     100  2.1.0 [100 should be 10000]
- *    1.0.0      (from here on, the   100  2.1.0 [100 should be 10000]
- *    1.0.1       png.h string is   10001  2.1.0
- *    1.0.1a-e    identical to the  10002  from here on, the shared library
- *    1.0.2       source version)   10002  is 2.V where V is the source code
- *    1.0.2a-b                      10003  version, except as noted.
- *    1.0.3                         10003
- *    1.0.3a-d                      10004
- *    1.0.4                         10004
- *    1.0.4a-f                      10005
- *    1.0.5 (+ 2 patches)           10005
- *    1.0.5a-d                      10006
- *    1.0.5e-r                      10100 (not source compatible)
- *    1.0.5s-v                      10006 (not binary compatible)
- *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)
- *    1.0.6d-f                      10007 (still binary incompatible)
- *    1.0.6g                        10007
- *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)
- *    1.0.6i                        10007  10.6i
- *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
- *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)
- *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)
- *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
- *    1.0.7                    1    10007  (still compatible)
- *    1.0.8beta1-4             1    10008  2.1.0.8beta1-4
- *    1.0.8rc1                 1    10008  2.1.0.8rc1
- *    1.0.8                    1    10008  2.1.0.8
- *    1.0.9beta1-6             1    10009  2.1.0.9beta1-6
- *    1.0.9rc1                 1    10009  2.1.0.9rc1
- *    1.0.9beta7-10            1    10009  2.1.0.9beta7-10
- *    1.0.9rc2                 1    10009  2.1.0.9rc2
- *    1.0.9                    1    10009  2.1.0.9
- *    1.0.10beta1              1    10010  2.1.0.10beta1
- *    1.0.10rc1                1    10010  2.1.0.10rc1
- *    1.0.10                   1    10010  2.1.0.10
- *    1.0.11beta1-3            1    10011  2.1.0.11beta1-3
- *    1.0.11rc1                1    10011  2.1.0.11rc1
- *    1.0.11                   1    10011  2.1.0.11
- *    1.0.12beta1-2            2    10012  2.1.0.12beta1-2
- *    1.0.12rc1                2    10012  2.1.0.12rc1
- *    1.0.12                   2    10012  2.1.0.12
- *    1.1.0a-f                 -    10100  2.1.1.0a-f (branch abandoned)
- *    1.2.0beta1-2             2    10200  2.1.2.0beta1-2
- *    1.2.0beta3-5             3    10200  3.1.2.0beta3-5
- *    1.2.0rc1                 3    10200  3.1.2.0rc1
- *    1.2.0                    3    10200  3.1.2.0
- *    1.2.1beta1-4             3    10201  3.1.2.1beta1-4
- *    1.2.1rc1-2               3    10201  3.1.2.1rc1-2
- *    1.2.1                    3    10201  3.1.2.1
- *    1.2.2beta1-6            12    10202  12.so.0.1.2.2beta1-6
- *    1.0.13beta1             10    10013  10.so.0.1.0.13beta1
- *    1.0.13rc1               10    10013  10.so.0.1.0.13rc1
- *    1.2.2rc1                12    10202  12.so.0.1.2.2rc1
- *    1.0.13                  10    10013  10.so.0.1.0.13
- *    1.2.2                   12    10202  12.so.0.1.2.2
- *    1.2.3rc1-6              12    10203  12.so.0.1.2.3rc1-6
- *    1.2.3                   12    10203  12.so.0.1.2.3
- *    1.2.4beta1-3            13    10204  12.so.0.1.2.4beta1-3
- *    1.0.14rc1               13    10014  10.so.0.1.0.14rc1
- *    1.2.4rc1                13    10204  12.so.0.1.2.4rc1
- *    1.0.14                  10    10014  10.so.0.1.0.14
- *    1.2.4                   13    10204  12.so.0.1.2.4
- *    1.2.5beta1-2            13    10205  12.so.0.1.2.5beta1-2
- *    1.0.15rc1-3             10    10015  10.so.0.1.0.15rc1-3
- *    1.2.5rc1-3              13    10205  12.so.0.1.2.5rc1-3
- *    1.0.15                  10    10015  10.so.0.1.0.15
- *    1.2.5                   13    10205  12.so.0.1.2.5
- *    1.2.6beta1-4            13    10206  12.so.0.1.2.6beta1-4
- *    1.0.16                  10    10016  10.so.0.1.0.16
- *    1.2.6                   13    10206  12.so.0.1.2.6
- *    1.2.7beta1-2            13    10207  12.so.0.1.2.7beta1-2
- *    1.0.17rc1               10    10017  12.so.0.1.0.17rc1
- *    1.2.7rc1                13    10207  12.so.0.1.2.7rc1
- *    1.0.17                  10    10017  12.so.0.1.0.17
- *    1.2.7                   13    10207  12.so.0.1.2.7
- *    1.2.8beta1-5            13    10208  12.so.0.1.2.8beta1-5
- *    1.0.18rc1-5             10    10018  12.so.0.1.0.18rc1-5
- *    1.2.8rc1-5              13    10208  12.so.0.1.2.8rc1-5
- *    1.0.18                  10    10018  12.so.0.1.0.18
- *    1.2.8                   13    10208  12.so.0.1.2.8
- *    1.2.9beta1-3            13    10209  12.so.0.1.2.9beta1-3
- *    1.2.9beta4-11           13    10209  12.so.0.9[.0]
- *    1.2.9rc1                13    10209  12.so.0.9[.0]
- *    1.2.9                   13    10209  12.so.0.9[.0]
- *    1.2.10beta1-7           13    10210  12.so.0.10[.0]
- *    1.2.10rc1-2             13    10210  12.so.0.10[.0]
- *    1.2.10                  13    10210  12.so.0.10[.0]
- *    1.4.0beta1-5            14    10400  14.so.0.0[.0]
- *    1.2.11beta1-4           13    10211  12.so.0.11[.0]
- *    1.4.0beta7-8            14    10400  14.so.0.0[.0]
- *    1.2.11                  13    10211  12.so.0.11[.0]
- *    1.2.12                  13    10212  12.so.0.12[.0]
- *    1.4.0beta9-14           14    10400  14.so.0.0[.0]
- *    1.2.13                  13    10213  12.so.0.13[.0]
- *    1.4.0beta15-36          14    10400  14.so.0.0[.0]
- *    1.4.0beta37-87          14    10400  14.so.14.0[.0]
- *    1.4.0rc01               14    10400  14.so.14.0[.0]
- *    1.4.0beta88-109         14    10400  14.so.14.0[.0]
- *    1.4.0rc02-08            14    10400  14.so.14.0[.0]
- *    1.4.0                   14    10400  14.so.14.0[.0]
- *    1.4.1beta01-03          14    10401  14.so.14.1[.0]
- *    1.4.1rc01               14    10401  14.so.14.1[.0]
- *    1.4.1beta04-12          14    10401  14.so.14.1[.0]
- *    1.4.1                   14    10401  14.so.14.1[.0]
- *    1.4.2                   14    10402  14.so.14.2[.0]
- *    1.4.3                   14    10403  14.so.14.3[.0]
- *    1.4.4                   14    10404  14.so.14.4[.0]
- *    1.5.0beta01-58          15    10500  15.so.15.0[.0]
- *    1.5.0rc01-07            15    10500  15.so.15.0[.0]
- *    1.5.0                   15    10500  15.so.15.0[.0]
- *    1.5.1beta01-11          15    10501  15.so.15.1[.0]
- *    1.5.1rc01-02            15    10501  15.so.15.1[.0]
- *    1.5.1                   15    10501  15.so.15.1[.0]
- *    1.5.2beta01-03          15    10502  15.so.15.2[.0]
- *    1.5.2rc01-03            15    10502  15.so.15.2[.0]
- *    1.5.2                   15    10502  15.so.15.2[.0]
- *    1.5.3beta01-10          15    10503  15.so.15.3[.0]
- *    1.5.3rc01-02            15    10503  15.so.15.3[.0]
- *    1.5.3beta11             15    10503  15.so.15.3[.0]
- *    1.5.3 [omitted]
- *    1.5.4beta01-08          15    10504  15.so.15.4[.0]
- *    1.5.4rc01               15    10504  15.so.15.4[.0]
- *    1.5.4                   15    10504  15.so.15.4[.0]
- *    1.5.5beta01-08          15    10505  15.so.15.5[.0]
- *    1.5.5rc01               15    10505  15.so.15.5[.0]
- *    1.5.5                   15    10505  15.so.15.5[.0]
- *    1.5.6beta01-07          15    10506  15.so.15.6[.0]
- *    1.5.6rc01-03            15    10506  15.so.15.6[.0]
- *    1.5.6                   15    10506  15.so.15.6[.0]
- *    1.5.7beta01-05          15    10507  15.so.15.7[.0]
- *    1.5.7rc01-03            15    10507  15.so.15.7[.0]
- *    1.5.7                   15    10507  15.so.15.7[.0]
- *    1.6.0beta01-40          16    10600  16.so.16.0[.0]
- *    1.6.0rc01-08            16    10600  16.so.16.0[.0]
- *    1.6.0                   16    10600  16.so.16.0[.0]
- *    1.6.1beta01-09          16    10601  16.so.16.1[.0]
- *    1.6.1rc01               16    10601  16.so.16.1[.0]
- *    1.6.1                   16    10601  16.so.16.1[.0]
- *    1.6.2beta01             16    10602  16.so.16.2[.0]
- *    1.6.2rc01-06            16    10602  16.so.16.2[.0]
- *    1.6.2                   16    10602  16.so.16.2[.0]
- *    1.6.3beta01-11          16    10603  16.so.16.3[.0]
- *    1.6.3rc01               16    10603  16.so.16.3[.0]
- *    1.6.3                   16    10603  16.so.16.3[.0]
- *    1.6.4beta01-02          16    10604  16.so.16.4[.0]
- *    1.6.4rc01               16    10604  16.so.16.4[.0]
- *    1.6.4                   16    10604  16.so.16.4[.0]
- *    1.6.5                   16    10605  16.so.16.5[.0]
- *    1.6.6                   16    10606  16.so.16.6[.0]
- *    1.6.7beta01-04          16    10607  16.so.16.7[.0]
- *    1.6.7rc01-03            16    10607  16.so.16.7[.0]
- *    1.6.7                   16    10607  16.so.16.7[.0]
- *    1.6.8beta01-02          16    10608  16.so.16.8[.0]
- *    1.6.8rc01-02            16    10608  16.so.16.8[.0]
- *    1.6.8                   16    10608  16.so.16.8[.0]
- *    1.6.9beta01-04          16    10609  16.so.16.9[.0]
- *    1.6.9rc01-02            16    10609  16.so.16.9[.0]
- *    1.6.9                   16    10609  16.so.16.9[.0]
- *    1.6.10beta01-03         16    10610  16.so.16.10[.0]
- *    1.6.10rc01-03           16    10610  16.so.16.10[.0]
- *    1.6.10                  16    10610  16.so.16.10[.0]
- *    1.6.11beta01-06         16    10611  16.so.16.11[.0]
- *    1.6.11rc01-02           16    10611  16.so.16.11[.0]
- *    1.6.11                  16    10611  16.so.16.11[.0]
- *    1.6.12rc01-03           16    10612  16.so.16.12[.0]
- *    1.6.12                  16    10612  16.so.16.12[.0]
- *    1.6.13beta01-04         16    10613  16.so.16.13[.0]
- *    1.6.13rc01-02           16    10613  16.so.16.13[.0]
- *    1.6.13                  16    10613  16.so.16.13[.0]
- *    1.6.14beta01-07         16    10614  16.so.16.14[.0]
- *    1.6.14rc01-02           16    10614  16.so.16.14[.0]
- *    1.6.14                  16    10614  16.so.16.14[.0]
- *    1.6.15beta01-08         16    10615  16.so.16.15[.0]
- *    1.6.15rc01-03           16    10615  16.so.16.15[.0]
- *    1.6.15                  16    10615  16.so.16.15[.0]
- *    1.6.16beta01-03         16    10616  16.so.16.16[.0]
- *    1.6.16rc01-02           16    10616  16.so.16.16[.0]
- *    1.6.16                  16    10616  16.so.16.16[.0]
- *
- *   Henceforth the source version will match the shared-library major
- *   and minor numbers; the shared-library major version number will be
- *   used for changes in backward compatibility, as it is intended.  The
- *   PNG_LIBPNG_VER macro, which is not used within libpng but is available
- *   for applications, is an unsigned integer of the form xyyzz corresponding
- *   to the source version x.y.z (leading zeros in y and z).  Beta versions
- *   were given the previous public release number plus a letter, until
- *   version 1.0.6j; from then on they were given the upcoming public
- *   release number plus "betaNN" or "rcNN".
- *
- *   Binary incompatibility exists only when applications make direct access
- *   to the info_ptr or png_ptr members through png.h, and the compiled
- *   application is loaded with a different version of the library.
- *
- *   DLLNUM will change each time there are forward or backward changes
- *   in binary compatibility (e.g., when a new feature is added).
- *
- * See libpng-manual.txt or libpng.3 for more information.  The PNG
- * specification is available as a W3C Recommendation and as an ISO
- * Specification, <http://www.w3.org/TR/2003/REC-PNG-20031110/
- */
-
-/*
- * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
- *
- * If you modify libpng you may insert additional notices immediately following
- * this sentence.
- *
- * This code is released under the libpng license.
- *
- * libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
- * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-1.2.5
- * with the following individual added to the list of Contributing Authors:
- *
- *    Cosmin Truta
- *
- * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
- * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-1.0.6
- * with the following individuals added to the list of Contributing Authors:
- *
- *    Simon-Pierre Cadieux
- *    Eric S. Raymond
- *    Gilles Vollant
- *
- * and with the following additions to the disclaimer:
- *
- *    There is no warranty against interference with your enjoyment of the
- *    library or against infringement.  There is no warranty that our
- *    efforts or the library will fulfill any of your particular purposes
- *    or needs.  This library is provided with all faults, and the entire
- *    risk of satisfactory quality, performance, accuracy, and effort is with
- *    the user.
- *
- * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
- * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-0.96,
- * with the following individuals added to the list of Contributing Authors:
- *
- *    Tom Lane
- *    Glenn Randers-Pehrson
- *    Willem van Schaik
- *
- * libpng versions 0.89, June 1996, through 0.96, May 1997, are
- * Copyright (c) 1996, 1997 Andreas Dilger
- * Distributed according to the same disclaimer and license as libpng-0.88,
- * with the following individuals added to the list of Contributing Authors:
- *
- *    John Bowler
- *    Kevin Bracey
- *    Sam Bushell
- *    Magnus Holmgren
- *    Greg Roelofs
- *    Tom Tanner
- *
- * libpng versions 0.5, May 1995, through 0.88, January 1996, are
- * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
- *
- * For the purposes of this copyright and license, "Contributing Authors"
- * is defined as the following set of individuals:
- *
- *    Andreas Dilger
- *    Dave Martindale
- *    Guy Eric Schalnat
- *    Paul Schmidt
- *    Tim Wegner
- *
- * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
- * and Group 42, Inc. disclaim all warranties, expressed or implied,
- * including, without limitation, the warranties of merchantability and of
- * fitness for any purpose.  The Contributing Authors and Group 42, Inc.
- * assume no liability for direct, indirect, incidental, special, exemplary,
- * or consequential damages, which may result from the use of the PNG
- * Reference Library, even if advised of the possibility of such damage.
- *
- * Permission is hereby granted to use, copy, modify, and distribute this
- * source code, or portions hereof, for any purpose, without fee, subject
- * to the following restrictions:
- *
- *   1. The origin of this source code must not be misrepresented.
- *
- *   2. Altered versions must be plainly marked as such and must not
- *      be misrepresented as being the original source.
- *
- *   3. This Copyright notice may not be removed or altered from
- *      any source or altered source distribution.
- *
- * The Contributing Authors and Group 42, Inc. specifically permit, without
- * fee, and encourage the use of this source code as a component to
- * supporting the PNG file format in commercial products.  If you use this
- * source code in a product, acknowledgment is not required but would be
- * appreciated.
- */
-
-/*
- * A "png_get_copyright" function is available, for convenient use in "about"
- * boxes and the like:
- *
- *     printf("%s", png_get_copyright(NULL));
- *
- * Also, the PNG logo (in PNG format, of course) is supplied in the
- * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
- */
-
-/*
- * Libpng is OSI Certified Open Source Software.  OSI Certified is a
- * certification mark of the Open Source Initiative.
- */
-
-/*
- * The contributing authors would like to thank all those who helped
- * with testing, bug fixes, and patience.  This wouldn't have been
- * possible without all of you.
- *
- * Thanks to Frank J. T. Wojcik for helping with the documentation.
- */
-
-/*
- * Y2K compliance in libpng:
- * =========================
- *
- *    December 22, 2014
- *
- *    Since the PNG Development group is an ad-hoc body, we can't make
- *    an official declaration.
- *
- *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.6.16 are Y2K compliant.  It is my belief that
- *    earlier versions were also Y2K compliant.
- *
- *    Libpng only has two year fields.  One is a 2-byte unsigned integer
- *    that will hold years up to 65535.  The other, which is deprecated,
- *    holds the date in text format, and will hold years up to 9999.
- *
- *    The integer is
- *        "png_uint_16 year" in png_time_struct.
- *
- *    The string is
- *        "char time_buffer[29]" in png_struct.  This is no longer used
- *    in libpng-1.6.x and will be removed from libpng-1.7.0.
- *
- *    There are seven time-related functions:
- *        png.c: png_convert_to_rfc_1123_buffer() in png.c
- *          (formerly png_convert_to_rfc_1123() prior to libpng-1.5.x and
- *          png_convert_to_rfc_1152() in error prior to libpng-0.98)
- *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
- *        png_convert_from_time_t() in pngwrite.c
- *        png_get_tIME() in pngget.c
- *        png_handle_tIME() in pngrutil.c, called in pngread.c
- *        png_set_tIME() in pngset.c
- *        png_write_tIME() in pngwutil.c, called in pngwrite.c
- *
- *    All handle dates properly in a Y2K environment.  The
- *    png_convert_from_time_t() function calls gmtime() to convert from system
- *    clock time, which returns (year - 1900), which we properly convert to
- *    the full 4-digit year.  There is a possibility that libpng applications
- *    are not passing 4-digit years into the png_convert_to_rfc_1123_buffer()
- *    function, or that they are incorrectly passing only a 2-digit year
- *    instead of "year - 1900" into the png_convert_from_struct_tm() function,
- *    but this is not under our control.  The libpng documentation has always
- *    stated that it works with 4-digit years, and the APIs have been
- *    documented as such.
- *
- *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
- *    integer to hold the year, and can hold years as large as 65535.
- *
- *    zlib, upon which libpng depends, is also Y2K compliant.  It contains
- *    no date-related code.
- *
- *       Glenn Randers-Pehrson
- *       libpng maintainer
- *       PNG Development Group
- */
-
-#ifndef PNG_H
-#define PNG_H
-
-/* This is not the place to learn how to use libpng. The file libpng-manual.txt
- * describes how to use libpng, and the file example.c summarizes it
- * with some code on which to build.  This file is useful for looking
- * at the actual function definitions and structure components.  If that
- * file has been stripped from your copy of libpng, you can find it at
- * <http://www.libpng.org/pub/png/libpng-manual.txt>
- *
- * If you just need to read a PNG file and don't want to read the documentation
- * skip to the end of this file and read the section entitled 'simplified API'.
- */
-
-/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.16"
-#define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.6.16 - December 22, 2014\n"
-
-#define PNG_LIBPNG_VER_SONUM   16
-#define PNG_LIBPNG_VER_DLLNUM  16
-
-/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
-#define PNG_LIBPNG_VER_MAJOR   1
-#define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 16
-
-/* This should match the numeric part of the final component of
- * PNG_LIBPNG_VER_STRING, omitting any leading zero:
- */
-
-#define PNG_LIBPNG_VER_BUILD  0
-
-/* Release Status */
-#define PNG_LIBPNG_BUILD_ALPHA    1
-#define PNG_LIBPNG_BUILD_BETA     2
-#define PNG_LIBPNG_BUILD_RC       3
-#define PNG_LIBPNG_BUILD_STABLE   4
-#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
-
-/* Release-Specific Flags */
-#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with
-                                       PNG_LIBPNG_BUILD_STABLE only */
-#define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_SPECIAL */
-#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_PRIVATE */
-
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
-
-/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
- * We must not include leading zeros.
- * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
- * version 1.0.0 was mis-numbered 100 instead of 10000).  From
- * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
- */
-#define PNG_LIBPNG_VER 10616 /* 1.6.16 */
-
-/* Library configuration: these options cannot be changed after
- * the library has been built.
- */
-#ifndef PNGLCONF_H
-    /* If pnglibconf.h is missing, you can
-     * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h
-     */
-#   include "pnglibconf.h"
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-   /* Machine specific configuration. */
-#  include "pngconf.h"
-#endif
-
-/*
- * Added at libpng-1.2.8
- *
- * Ref MSDN: Private as priority over Special
- * VS_FF_PRIVATEBUILD File *was not* built using standard release
- * procedures. If this value is given, the StringFileInfo block must
- * contain a PrivateBuild string.
- *
- * VS_FF_SPECIALBUILD File *was* built by the original company using
- * standard release procedures but is a variation of the standard
- * file of the same version number. If this value is given, the
- * StringFileInfo block must contain a SpecialBuild string.
- */
-
-#ifdef PNG_USER_PRIVATEBUILD /* From pnglibconf.h */
-#  define PNG_LIBPNG_BUILD_TYPE \
-       (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)
-#else
-#  ifdef PNG_LIBPNG_SPECIALBUILD
-#    define PNG_LIBPNG_BUILD_TYPE \
-         (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)
-#  else
-#    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)
-#  endif
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-
-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Version information for C files, stored in png.c.  This had better match
- * the version above.
- */
-#define png_libpng_ver png_get_header_ver(NULL)
-
-/* This file is arranged in several sections:
- *
- * 1. Any configuration options that can be specified by for the application
- *    code when it is built.  (Build time configuration is in pnglibconf.h)
- * 2. Type definitions (base types are defined in pngconf.h), structure
- *    definitions.
- * 3. Exported library functions.
- * 4. Simplified API.
- *
- * The library source code has additional files (principally pngpriv.h) that
- * allow configuration of the library.
- */
-/* Section 1: run time configuration
- * See pnglibconf.h for build time configuration
- *
- * Run time configuration allows the application to choose between
- * implementations of certain arithmetic APIs.  The default is set
- * at build time and recorded in pnglibconf.h, but it is safe to
- * override these (and only these) settings.  Note that this won't
- * change what the library does, only application code, and the
- * settings can (and probably should) be made on a per-file basis
- * by setting the #defines before including png.h
- *
- * Use macros to read integers from PNG data or use the exported
- * functions?
- *   PNG_USE_READ_MACROS: use the macros (see below)  Note that
- *     the macros evaluate their argument multiple times.
- *   PNG_NO_USE_READ_MACROS: call the relevant library function.
- *
- * Use the alternative algorithm for compositing alpha samples that
- * does not use division?
- *   PNG_READ_COMPOSITE_NODIV_SUPPORTED: use the 'no division'
- *      algorithm.
- *   PNG_NO_READ_COMPOSITE_NODIV: use the 'division' algorithm.
- *
- * How to handle benign errors if PNG_ALLOW_BENIGN_ERRORS is
- * false?
- *   PNG_ALLOW_BENIGN_ERRORS: map calls to the benign error
- *      APIs to png_warning.
- * Otherwise the calls are mapped to png_error.
- */
-
-/* Section 2: type definitions, including structures and compile time
- * constants.
- * See pngconf.h for base types that vary by machine/system
- */
-
-/* This triggers a compiler error in png.c, if png.c and png.h
- * do not agree upon the version number.
- */
-typedef char* png_libpng_version_1_6_16;
-
-/* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
- *
- * png_struct is the cache of information used while reading or writing a single
- * PNG file.  One of these is always required, although the simplified API
- * (below) hides the creation and destruction of it.
- */
-typedef struct png_struct_def png_struct;
-typedef const png_struct * png_const_structp;
-typedef png_struct * png_structp;
-typedef png_struct * * png_structpp;
-
-/* png_info contains information read from or to be written to a PNG file.  One
- * or more of these must exist while reading or creating a PNG file.  The
- * information is not used by libpng during read but is used to control what
- * gets written when a PNG file is created.  "png_get_" function calls read
- * information during read and "png_set_" functions calls write information
- * when creating a PNG.
- * been moved into a separate header file that is not accessible to
- * applications.  Read libpng-manual.txt or libpng.3 for more info.
- */
-typedef struct png_info_def png_info;
-typedef png_info * png_infop;
-typedef const png_info * png_const_infop;
-typedef png_info * * png_infopp;
-
-/* Types with names ending 'p' are pointer types.  The corresponding types with
- * names ending 'rp' are identical pointer types except that the pointer is
- * marked 'restrict', which means that it is the only pointer to the object
- * passed to the function.  Applications should not use the 'restrict' types;
- * it is always valid to pass 'p' to a pointer with a function argument of the
- * corresponding 'rp' type.  Different compilers have different rules with
- * regard to type matching in the presence of 'restrict'.  For backward
- * compatibility libpng callbacks never have 'restrict' in their parameters and,
- * consequentially, writing portable application code is extremely difficult if
- * an attempt is made to use 'restrict'.
- */
-typedef png_struct * PNG_RESTRICT png_structrp;
-typedef const png_struct * PNG_RESTRICT png_const_structrp;
-typedef png_info * PNG_RESTRICT png_inforp;
-typedef const png_info * PNG_RESTRICT png_const_inforp;
-
-/* Three color definitions.  The order of the red, green, and blue, (and the
- * exact size) is not important, although the size of the fields need to
- * be png_byte or png_uint_16 (as defined below).
- */
-typedef struct png_color_struct
-{
-   png_byte red;
-   png_byte green;
-   png_byte blue;
-} png_color;
-typedef png_color * png_colorp;
-typedef const png_color * png_const_colorp;
-typedef png_color * * png_colorpp;
-
-typedef struct png_color_16_struct
-{
-   png_byte index;    /* used for palette files */
-   png_uint_16 red;   /* for use in red green blue files */
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 gray;  /* for use in grayscale files */
-} png_color_16;
-typedef png_color_16 * png_color_16p;
-typedef const png_color_16 * png_const_color_16p;
-typedef png_color_16 * * png_color_16pp;
-
-typedef struct png_color_8_struct
-{
-   png_byte red;   /* for use in red green blue files */
-   png_byte green;
-   png_byte blue;
-   png_byte gray;  /* for use in grayscale files */
-   png_byte alpha; /* for alpha channel files */
-} png_color_8;
-typedef png_color_8 * png_color_8p;
-typedef const png_color_8 * png_const_color_8p;
-typedef png_color_8 * * png_color_8pp;
-
-/*
- * The following two structures are used for the in-core representation
- * of sPLT chunks.
- */
-typedef struct png_sPLT_entry_struct
-{
-   png_uint_16 red;
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 alpha;
-   png_uint_16 frequency;
-} png_sPLT_entry;
-typedef png_sPLT_entry * png_sPLT_entryp;
-typedef const png_sPLT_entry * png_const_sPLT_entryp;
-typedef png_sPLT_entry * * png_sPLT_entrypp;
-
-/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
- *  occupy the LSB of their respective members, and the MSB of each member
- *  is zero-filled.  The frequency member always occupies the full 16 bits.
- */
-
-typedef struct png_sPLT_struct
-{
-   png_charp name;           /* palette name */
-   png_byte depth;           /* depth of palette samples */
-   png_sPLT_entryp entries;  /* palette entries */
-   png_int_32 nentries;      /* number of palette entries */
-} png_sPLT_t;
-typedef png_sPLT_t * png_sPLT_tp;
-typedef const png_sPLT_t * png_const_sPLT_tp;
-typedef png_sPLT_t * * png_sPLT_tpp;
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
- * and whether that contents is compressed or not.  The "key" field
- * points to a regular zero-terminated C string.  The "text" fields can be a
- * regular C string, an empty string, or a NULL pointer.
- * However, the structure returned by png_get_text() will always contain
- * the "text" field as a regular zero-terminated C string (possibly
- * empty), never a NULL pointer, so it can be safely used in printf() and
- * other string-handling functions.  Note that the "itxt_length", "lang", and
- * "lang_key" members of the structure only exist when the library is built
- * with iTXt chunk support.  Prior to libpng-1.4.0 the library was built by
- * default without iTXt support. Also note that when iTXt *is* supported,
- * the "lang" and "lang_key" fields contain NULL pointers when the
- * "compression" field contains * PNG_TEXT_COMPRESSION_NONE or
- * PNG_TEXT_COMPRESSION_zTXt. Note that the "compression value" is not the
- * same as what appears in the PNG tEXt/zTXt/iTXt chunk's "compression flag"
- * which is always 0 or 1, or its "compression method" which is always 0.
- */
-typedef struct png_text_struct
-{
-   int  compression;       /* compression value:
-                             -1: tEXt, none
-                              0: zTXt, deflate
-                              1: iTXt, none
-                              2: iTXt, deflate  */
-   png_charp key;          /* keyword, 1-79 character description of "text" */
-   png_charp text;         /* comment, may be an empty string (ie "")
-                              or a NULL pointer */
-   png_size_t text_length; /* length of the text string */
-   png_size_t itxt_length; /* length of the itxt string */
-   png_charp lang;         /* language code, 0-79 characters
-                              or a NULL pointer */
-   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
-                              chars or a NULL pointer */
-} png_text;
-typedef png_text * png_textp;
-typedef const png_text * png_const_textp;
-typedef png_text * * png_textpp;
-#endif
-
-/* Supported compression types for text in PNG files (tEXt, and zTXt).
- * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */
-#define PNG_TEXT_COMPRESSION_NONE_WR -3
-#define PNG_TEXT_COMPRESSION_zTXt_WR -2
-#define PNG_TEXT_COMPRESSION_NONE    -1
-#define PNG_TEXT_COMPRESSION_zTXt     0
-#define PNG_ITXT_COMPRESSION_NONE     1
-#define PNG_ITXT_COMPRESSION_zTXt     2
-#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */
-
-/* png_time is a way to hold the time in an machine independent way.
- * Two conversions are provided, both from time_t and struct tm.  There
- * is no portable way to convert to either of these structures, as far
- * as I know.  If you know of a portable way, send it to me.  As a side
- * note - PNG has always been Year 2000 compliant!
- */
-typedef struct png_time_struct
-{
-   png_uint_16 year; /* full year, as in, 1995 */
-   png_byte month;   /* month of year, 1 - 12 */
-   png_byte day;     /* day of month, 1 - 31 */
-   png_byte hour;    /* hour of day, 0 - 23 */
-   png_byte minute;  /* minute of hour, 0 - 59 */
-   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
-} png_time;
-typedef png_time * png_timep;
-typedef const png_time * png_const_timep;
-typedef png_time * * png_timepp;
-
-#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) ||\
-   defined(PNG_USER_CHUNKS_SUPPORTED)
-/* png_unknown_chunk is a structure to hold queued chunks for which there is
- * no specific support.  The idea is that we can use this to queue
- * up private chunks for output even though the library doesn't actually
- * know about their semantics.
- *
- * The data in the structure is set by libpng on read and used on write.
- */
-typedef struct png_unknown_chunk_t
-{
-    png_byte name[5]; /* Textual chunk name with '\0' terminator */
-    png_byte *data;   /* Data, should not be modified on read! */
-    png_size_t size;
-
-    /* On write 'location' must be set using the flag values listed below.
-     * Notice that on read it is set by libpng however the values stored have
-     * more bits set than are listed below.  Always treat the value as a
-     * bitmask.  On write set only one bit - setting multiple bits may cause the
-     * chunk to be written in multiple places.
-     */
-    png_byte location; /* mode of operation at read time */
-}
-png_unknown_chunk;
-
-typedef png_unknown_chunk * png_unknown_chunkp;
-typedef const png_unknown_chunk * png_const_unknown_chunkp;
-typedef png_unknown_chunk * * png_unknown_chunkpp;
-#endif
-
-/* Flag values for the unknown chunk location byte. */
-#define PNG_HAVE_IHDR  0x01
-#define PNG_HAVE_PLTE  0x02
-#define PNG_AFTER_IDAT 0x08
-
-/* Maximum positive integer used in PNG is (2^31)-1 */
-#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
-#define PNG_UINT_32_MAX ((png_uint_32)(-1))
-#define PNG_SIZE_MAX ((png_size_t)(-1))
-
-/* These are constants for fixed point values encoded in the
- * PNG specification manner (x100000)
- */
-#define PNG_FP_1    100000
-#define PNG_FP_HALF  50000
-#define PNG_FP_MAX  ((png_fixed_point)0x7fffffffL)
-#define PNG_FP_MIN  (-PNG_FP_MAX)
-
-/* These describe the color_type field in png_info. */
-/* color type masks */
-#define PNG_COLOR_MASK_PALETTE    1
-#define PNG_COLOR_MASK_COLOR      2
-#define PNG_COLOR_MASK_ALPHA      4
-
-/* color types.  Note that not all combinations are legal */
-#define PNG_COLOR_TYPE_GRAY 0
-#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
-#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)
-#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
-#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
-/* aliases */
-#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA
-#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA
-
-/* This is for compression type. PNG 1.0-1.2 only define the single type. */
-#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
-#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
-
-/* This is for filter type. PNG 1.0-1.2 only define the single type. */
-#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */
-#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */
-#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE
-
-/* These are for the interlacing type.  These values should NOT be changed. */
-#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */
-#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */
-#define PNG_INTERLACE_LAST        2 /* Not a valid value */
-
-/* These are for the oFFs chunk.  These values should NOT be changed. */
-#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */
-#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */
-#define PNG_OFFSET_LAST           2 /* Not a valid value */
-
-/* These are for the pCAL chunk.  These values should NOT be changed. */
-#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
-#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
-#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
-#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
-#define PNG_EQUATION_LAST         4 /* Not a valid value */
-
-/* These are for the sCAL chunk.  These values should NOT be changed. */
-#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
-#define PNG_SCALE_METER           1 /* meters per pixel */
-#define PNG_SCALE_RADIAN          2 /* radians per pixel */
-#define PNG_SCALE_LAST            3 /* Not a valid value */
-
-/* These are for the pHYs chunk.  These values should NOT be changed. */
-#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */
-#define PNG_RESOLUTION_METER      1 /* pixels/meter */
-#define PNG_RESOLUTION_LAST       2 /* Not a valid value */
-
-/* These are for the sRGB chunk.  These values should NOT be changed. */
-#define PNG_sRGB_INTENT_PERCEPTUAL 0
-#define PNG_sRGB_INTENT_RELATIVE   1
-#define PNG_sRGB_INTENT_SATURATION 2
-#define PNG_sRGB_INTENT_ABSOLUTE   3
-#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */
-
-/* This is for text chunks */
-#define PNG_KEYWORD_MAX_LENGTH     79
-
-/* Maximum number of entries in PLTE/sPLT/tRNS arrays */
-#define PNG_MAX_PALETTE_LENGTH    256
-
-/* These determine if an ancillary chunk's data has been successfully read
- * from the PNG header, or if the application has filled in the corresponding
- * data in the info_struct to be written into the output file.  The values
- * of the PNG_INFO_<chunk> defines should NOT be changed.
- */
-#define PNG_INFO_gAMA 0x0001
-#define PNG_INFO_sBIT 0x0002
-#define PNG_INFO_cHRM 0x0004
-#define PNG_INFO_PLTE 0x0008
-#define PNG_INFO_tRNS 0x0010
-#define PNG_INFO_bKGD 0x0020
-#define PNG_INFO_hIST 0x0040
-#define PNG_INFO_pHYs 0x0080
-#define PNG_INFO_oFFs 0x0100
-#define PNG_INFO_tIME 0x0200
-#define PNG_INFO_pCAL 0x0400
-#define PNG_INFO_sRGB 0x0800   /* GR-P, 0.96a */
-#define PNG_INFO_iCCP 0x1000   /* ESR, 1.0.6 */
-#define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
-#define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
-#define PNG_INFO_IDAT 0x8000   /* ESR, 1.0.6 */
-
-/* This is used for the transformation routines, as some of them
- * change these values for the row.  It also should enable using
- * the routines for other purposes.
- */
-typedef struct png_row_info_struct
-{
-   png_uint_32 width;    /* width of row */
-   png_size_t rowbytes;  /* number of bytes in row */
-   png_byte color_type;  /* color type of row */
-   png_byte bit_depth;   /* bit depth of row */
-   png_byte channels;    /* number of channels (1, 2, 3, or 4) */
-   png_byte pixel_depth; /* bits per pixel (depth * channels) */
-} png_row_info;
-
-typedef png_row_info * png_row_infop;
-typedef png_row_info * * png_row_infopp;
-
-/* These are the function types for the I/O functions and for the functions
- * that allow the user to override the default I/O functions with his or her
- * own.  The png_error_ptr type should match that of user-supplied warning
- * and error functions, while the png_rw_ptr type should match that of the
- * user read/write data functions.  Note that the 'write' function must not
- * modify the buffer it is passed. The 'read' function, on the other hand, is
- * expected to return the read data in the buffer.
- */
-typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp));
-typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, png_size_t));
-typedef PNG_CALLBACK(void, *png_flush_ptr, (png_structp));
-typedef PNG_CALLBACK(void, *png_read_status_ptr, (png_structp, png_uint_32,
-    int));
-typedef PNG_CALLBACK(void, *png_write_status_ptr, (png_structp, png_uint_32,
-    int));
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
-typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
-
-/* The following callback receives png_uint_32 row_number, int pass for the
- * png_bytep data of the row.  When transforming an interlaced image the
- * row number is the row number within the sub-image of the interlace pass, so
- * the value will increase to the height of the sub-image (not the full image)
- * then reset to 0 for the next pass.
- *
- * Use PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to
- * find the output pixel (x,y) given an interlaced sub-image pixel
- * (row,col,pass).  (See below for these macros.)
- */
-typedef PNG_CALLBACK(void, *png_progressive_row_ptr, (png_structp, png_bytep,
-    png_uint_32, int));
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-typedef PNG_CALLBACK(void, *png_user_transform_ptr, (png_structp, png_row_infop,
-    png_bytep));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,
-    png_unknown_chunkp));
-#endif
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-/* not used anywhere */
-/* typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp)); */
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* This must match the function definition in <setjmp.h>, and the application
- * must include this before png.h to obtain the definition of jmp_buf.  The
- * function is required to be PNG_NORETURN, but this is not checked.  If the
- * function does return the application will crash via an abort() or similar
- * system level call.
- *
- * If you get a warning here while building the library you may need to make
- * changes to ensure that pnglibconf.h records the calling convention used by
- * your compiler.  This may be very difficult - try using a different compiler
- * to build the library!
- */
-PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
-#endif
-
-/* Transform masks for the high-level interface */
-#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */
-#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */
-#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */
-#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */
-#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */
-#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */
-#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */
-#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */
-#define PNG_TRANSFORM_BGR            0x0080    /* read and write */
-#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
-#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
-#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
-#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* write only */
-/* Added to libpng-1.2.34 */
-#define PNG_TRANSFORM_STRIP_FILLER_BEFORE PNG_TRANSFORM_STRIP_FILLER
-#define PNG_TRANSFORM_STRIP_FILLER_AFTER 0x1000 /* write only */
-/* Added to libpng-1.4.0 */
-#define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */
-/* Added to libpng-1.5.4 */
-#define PNG_TRANSFORM_EXPAND_16     0x4000      /* read only */
-#define PNG_TRANSFORM_SCALE_16      0x8000      /* read only */
-
-/* Flags for MNG supported features */
-#define PNG_FLAG_MNG_EMPTY_PLTE     0x01
-#define PNG_FLAG_MNG_FILTER_64      0x04
-#define PNG_ALL_MNG_FEATURES        0x05
-
-/* NOTE: prior to 1.5 these functions had no 'API' style declaration,
- * this allowed the zlib default functions to be used on Windows
- * platforms.  In 1.5 the zlib default malloc (which just calls malloc and
- * ignores the first argument) should be completely compatible with the
- * following.
- */
-typedef PNG_CALLBACK(png_voidp, *png_malloc_ptr, (png_structp,
-    png_alloc_size_t));
-typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp));
-
-/* Section 3: exported functions
- * Here are the function definitions most commonly used.  This is not
- * the place to find out how to use libpng.  See libpng-manual.txt for the
- * full explanation, see example.c for the summary.  This just provides
- * a simple one line description of the use of each function.
- *
- * The PNG_EXPORT() and PNG_EXPORTA() macros used below are defined in
- * pngconf.h and in the *.dfn files in the scripts directory.
- *
- *   PNG_EXPORT(ordinal, type, name, (args));
- *
- *       ordinal:    ordinal that is used while building
- *                   *.def files. The ordinal value is only
- *                   relevant when preprocessing png.h with
- *                   the *.dfn files for building symbol table
- *                   entries, and are removed by pngconf.h.
- *       type:       return type of the function
- *       name:       function name
- *       args:       function arguments, with types
- *
- * When we wish to append attributes to a function prototype we use
- * the PNG_EXPORTA() macro instead.
- *
- *   PNG_EXPORTA(ordinal, type, name, (args), attributes);
- *
- *       ordinal, type, name, and args: same as in PNG_EXPORT().
- *       attributes: function attributes
- */
-
-/* Returns the version number of the library */
-PNG_EXPORT(1, png_uint_32, png_access_version_number, (void));
-
-/* Tell lib we have already handled the first <num_bytes> magic bytes.
- * Handling more than 8 bytes from the beginning of the file is an error.
- */
-PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));
-
-/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
- * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
- * signature, and non-zero otherwise.  Having num_to_check == 0 or
- * start > 7 will always fail (ie return non-zero).
- */
-PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, png_size_t start,
-    png_size_t num_to_check));
-
-/* Simple signature checking function.  This is the same as calling
- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
- */
-#define png_check_sig(sig, n) !png_sig_cmp((sig), 0, (n))
-
-/* Allocate and initialize png_ptr struct for reading, and any other memory. */
-PNG_EXPORTA(4, png_structp, png_create_read_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),
-    PNG_ALLOCATED);
-
-/* Allocate and initialize png_ptr struct for writing, and any other memory */
-PNG_EXPORTA(5, png_structp, png_create_write_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn),
-    PNG_ALLOCATED);
-
-PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,
-    (png_const_structrp png_ptr));
-
-PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structrp png_ptr,
-    png_size_t size));
-
-/* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
- * match up.
- */
-#ifdef PNG_SETJMP_SUPPORTED
-/* This function returns the jmp_buf built in to *png_ptr.  It must be
- * supplied with an appropriate 'longjmp' function to use on that jmp_buf
- * unless the default error function is overridden in which case NULL is
- * acceptable.  The size of the jmp_buf is checked against the actual size
- * allocated by the library - the call will return NULL on a mismatch
- * indicating an ABI mismatch.
- */
-PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structrp png_ptr,
-    png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));
-#  define png_jmpbuf(png_ptr) \
-      (*png_set_longjmp_fn((png_ptr), longjmp, (sizeof (jmp_buf))))
-#else
-#  define png_jmpbuf(png_ptr) \
-      (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)
-#endif
-/* This function should be used by libpng applications in place of
- * longjmp(png_ptr->jmpbuf, val).  If longjmp_fn() has been set, it
- * will use it; otherwise it will call PNG_ABORT().  This function was
- * added in libpng-1.5.0.
- */
-PNG_EXPORTA(9, void, png_longjmp, (png_const_structrp png_ptr, int val),
-    PNG_NORETURN);
-
-#ifdef PNG_READ_SUPPORTED
-/* Reset the compression stream */
-PNG_EXPORTA(10, int, png_reset_zstream, (png_structrp png_ptr), PNG_DEPRECATED);
-#endif
-
-/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(11, png_structp, png_create_read_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn,
-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
-    PNG_ALLOCATED);
-PNG_EXPORTA(12, png_structp, png_create_write_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn,
-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
-    PNG_ALLOCATED);
-#endif
-
-/* Write the PNG file signature. */
-PNG_EXPORT(13, void, png_write_sig, (png_structrp png_ptr));
-
-/* Write a PNG chunk - size, type, (optional) data, CRC. */
-PNG_EXPORT(14, void, png_write_chunk, (png_structrp png_ptr, png_const_bytep
-    chunk_name, png_const_bytep data, png_size_t length));
-
-/* Write the start of a PNG chunk - length and chunk name. */
-PNG_EXPORT(15, void, png_write_chunk_start, (png_structrp png_ptr,
-    png_const_bytep chunk_name, png_uint_32 length));
-
-/* Write the data of a PNG chunk started with png_write_chunk_start(). */
-PNG_EXPORT(16, void, png_write_chunk_data, (png_structrp png_ptr,
-    png_const_bytep data, png_size_t length));
-
-/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
-PNG_EXPORT(17, void, png_write_chunk_end, (png_structrp png_ptr));
-
-/* Allocate and initialize the info structure */
-PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_const_structrp png_ptr),
-    PNG_ALLOCATED);
-
-/* DEPRECATED: this function allowed init structures to be created using the
- * default allocation method (typically malloc).  Use is deprecated in 1.6.0 and
- * the API will be removed in the future.
- */
-PNG_EXPORTA(19, void, png_info_init_3, (png_infopp info_ptr,
-    png_size_t png_info_struct_size), PNG_DEPRECATED);
-
-/* Writes all the PNG information before the image. */
-PNG_EXPORT(20, void, png_write_info_before_PLTE,
-    (png_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(21, void, png_write_info,
-    (png_structrp png_ptr, png_const_inforp info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the information before the actual image data. */
-PNG_EXPORT(22, void, png_read_info,
-    (png_structrp png_ptr, png_inforp info_ptr));
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-   /* Convert to a US string format: there is no localization support in this
-    * routine.  The original implementation used a 29 character buffer in
-    * png_struct, this will be removed in future versions.
-    */
-#if PNG_LIBPNG_VER < 10700
-/* To do: remove this from libpng17 (and from libpng17/png.c and pngstruct.h) */
-PNG_EXPORTA(23, png_const_charp, png_convert_to_rfc1123, (png_structrp png_ptr,
-    png_const_timep ptime),PNG_DEPRECATED);
-#endif
-PNG_EXPORT(241, int, png_convert_to_rfc1123_buffer, (char out[29],
-    png_const_timep ptime));
-#endif
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-/* Convert from a struct tm to png_time */
-PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
-    const struct tm * ttime));
-
-/* Convert from time_t to png_time.  Uses gmtime() */
-PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));
-#endif /* CONVERT_tIME */
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
-PNG_EXPORT(26, void, png_set_expand, (png_structrp png_ptr));
-PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structrp png_ptr));
-PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structrp png_ptr));
-PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-/* Expand to 16-bit channels, forces conversion of palette to RGB and expansion
- * of a tRNS chunk if present.
- */
-PNG_EXPORT(221, void, png_set_expand_16, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Use blue, green, red order for pixels. */
-PNG_EXPORT(30, void, png_set_bgr, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-/* Expand the grayscale to 24-bit RGB if necessary. */
-PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-/* Reduce RGB to grayscale. */
-#define PNG_ERROR_ACTION_NONE  1
-#define PNG_ERROR_ACTION_WARN  2
-#define PNG_ERROR_ACTION_ERROR 3
-#define PNG_RGB_TO_GRAY_DEFAULT (-1)/*for red/green coefficients*/
-
-PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structrp png_ptr,
-    int error_action, double red, double green))
-PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structrp png_ptr,
-    int error_action, png_fixed_point red, png_fixed_point green))
-
-PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structrp
-    png_ptr));
-#endif
-
-#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
-    png_colorp palette));
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-/* How the alpha channel is interpreted - this affects how the color channels
- * of a PNG file are returned to the calling application when an alpha channel,
- * or a tRNS chunk in a palette file, is present.
- *
- * This has no effect on the way pixels are written into a PNG output
- * datastream. The color samples in a PNG datastream are never premultiplied
- * with the alpha samples.
- *
- * The default is to return data according to the PNG specification: the alpha
- * channel is a linear measure of the contribution of the pixel to the
- * corresponding composited pixel, and the color channels are unassociated
- * (not premultiplied).  The gamma encoded color channels must be scaled
- * according to the contribution and to do this it is necessary to undo
- * the encoding, scale the color values, perform the composition and reencode
- * the values.  This is the 'PNG' mode.
- *
- * The alternative is to 'associate' the alpha with the color information by
- * storing color channel values that have been scaled by the alpha.
- * image.  These are the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' modes
- * (the latter being the two common names for associated alpha color channels).
- *
- * For the 'OPTIMIZED' mode, a pixel is treated as opaque only if the alpha
- * value is equal to the maximum value.
- *
- * The final choice is to gamma encode the alpha channel as well.  This is
- * broken because, in practice, no implementation that uses this choice
- * correctly undoes the encoding before handling alpha composition.  Use this
- * choice only if other serious errors in the software or hardware you use
- * mandate it; the typical serious error is for dark halos to appear around
- * opaque areas of the composited PNG image because of arithmetic overflow.
- *
- * The API function png_set_alpha_mode specifies which of these choices to use
- * with an enumerated 'mode' value and the gamma of the required output:
- */
-#define PNG_ALPHA_PNG           0 /* according to the PNG standard */
-#define PNG_ALPHA_STANDARD      1 /* according to Porter/Duff */
-#define PNG_ALPHA_ASSOCIATED    1 /* as above; this is the normal practice */
-#define PNG_ALPHA_PREMULTIPLIED 1 /* as above */
-#define PNG_ALPHA_OPTIMIZED     2 /* 'PNG' for opaque pixels, else 'STANDARD' */
-#define PNG_ALPHA_BROKEN        3 /* the alpha channel is gamma encoded */
-
-PNG_FP_EXPORT(227, void, png_set_alpha_mode, (png_structrp png_ptr, int mode,
-    double output_gamma))
-PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr,
-    int mode, png_fixed_point output_gamma))
-#endif
-
-#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-/* The output_gamma value is a screen gamma in libpng terminology: it expresses
- * how to decode the output values, not how they are encoded.
- */
-#define PNG_DEFAULT_sRGB -1       /* sRGB gamma and color space */
-#define PNG_GAMMA_MAC_18 -2       /* Old Mac '1.8' gamma and color space */
-#define PNG_GAMMA_sRGB   220000   /* Television standards--matches sRGB gamma */
-#define PNG_GAMMA_LINEAR PNG_FP_1 /* Linear */
-#endif
-
-/* The following are examples of calls to png_set_alpha_mode to achieve the
- * required overall gamma correction and, where necessary, alpha
- * premultiplication.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);
- *    This is the default libpng handling of the alpha channel - it is not
- *    pre-multiplied into the color components.  In addition the call states
- *    that the output is for a sRGB system and causes all PNG files without gAMA
- *    chunks to be assumed to be encoded using sRGB.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
- *    In this case the output is assumed to be something like an sRGB conformant
- *    display preceeded by a power-law lookup table of power 1.45.  This is how
- *    early Mac systems behaved.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);
- *    This is the classic Jim Blinn approach and will work in academic
- *    environments where everything is done by the book.  It has the shortcoming
- *    of assuming that input PNG data with no gamma information is linear - this
- *    is unlikely to be correct unless the PNG files where generated locally.
- *    Most of the time the output precision will be so low as to show
- *    significant banding in dark areas of the image.
- *
- * png_set_expand_16(pp);
- * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_DEFAULT_sRGB);
- *    This is a somewhat more realistic Jim Blinn inspired approach.  PNG files
- *    are assumed to have the sRGB encoding if not marked with a gamma value and
- *    the output is always 16 bits per component.  This permits accurate scaling
- *    and processing of the data.  If you know that your input PNG files were
- *    generated locally you might need to replace PNG_DEFAULT_sRGB with the
- *    correct value for your system.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_OPTIMIZED, PNG_DEFAULT_sRGB);
- *    If you just need to composite the PNG image onto an existing background
- *    and if you control the code that does this you can use the optimization
- *    setting.  In this case you just copy completely opaque pixels to the
- *    output.  For pixels that are not completely transparent (you just skip
- *    those) you do the composition math using png_composite or png_composite_16
- *    below then encode the resultant 8-bit or 16-bit values to match the output
- *    encoding.
- *
- * Other cases
- *    If neither the PNG nor the standard linear encoding work for you because
- *    of the software or hardware you use then you have a big problem.  The PNG
- *    case will probably result in halos around the image.  The linear encoding
- *    will probably result in a washed out, too bright, image (it's actually too
- *    contrasty.)  Try the ALPHA_OPTIMIZED mode above - this will probably
- *    substantially reduce the halos.  Alternatively try:
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_BROKEN, PNG_DEFAULT_sRGB);
- *    This option will also reduce the halos, but there will be slight dark
- *    halos round the opaque parts of the image where the background is light.
- *    In the OPTIMIZED mode the halos will be light halos where the background
- *    is dark.  Take your pick - the halos are unavoidable unless you can get
- *    your hardware/software fixed!  (The OPTIMIZED approach is slightly
- *    faster.)
- *
- * When the default gamma of PNG files doesn't match the output gamma.
- *    If you have PNG files with no gamma information png_set_alpha_mode allows
- *    you to provide a default gamma, but it also sets the ouput gamma to the
- *    matching value.  If you know your PNG files have a gamma that doesn't
- *    match the output you can take advantage of the fact that
- *    png_set_alpha_mode always sets the output gamma but only sets the PNG
- *    default if it is not already set:
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
- *    The first call sets both the default and the output gamma values, the
- *    second call overrides the output gamma without changing the default.  This
- *    is easier than achieving the same effect with png_set_gamma.  You must use
- *    PNG_ALPHA_PNG for the first call - internal checking in png_set_alpha will
- *    fire if more than one call to png_set_alpha_mode and png_set_background is
- *    made in the same read operation, however multiple calls with PNG_ALPHA_PNG
- *    are ignored.
- */
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-PNG_EXPORT(36, void, png_set_strip_alpha, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-PNG_EXPORT(37, void, png_set_swap_alpha, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-PNG_EXPORT(38, void, png_set_invert_alpha, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-/* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
-PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
-    int flags));
-/* The values of the PNG_FILLER_ defines should NOT be changed */
-#  define PNG_FILLER_BEFORE 0
-#  define PNG_FILLER_AFTER 1
-/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
-PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,
-    png_uint_32 filler, int flags));
-#endif /* READ_FILLER || WRITE_FILLER */
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Swap bytes in 16-bit depth files. */
-PNG_EXPORT(41, void, png_set_swap, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
-/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
-PNG_EXPORT(42, void, png_set_packing, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
-    defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-/* Swap packing order of pixels in bytes. */
-PNG_EXPORT(43, void, png_set_packswap, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-/* Converts files to legal bit depths. */
-PNG_EXPORT(44, void, png_set_shift, (png_structrp png_ptr, png_const_color_8p
-    true_bits));
-#endif
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
-    defined(PNG_WRITE_INTERLACING_SUPPORTED)
-/* Have the code handle the interlacing.  Returns the number of passes.
- * MUST be called before png_read_update_info or png_start_read_image,
- * otherwise it will not have the desired effect.  Note that it is still
- * necessary to call png_read_row or png_read_rows png_get_image_height
- * times for each pass.
-*/
-PNG_EXPORT(45, int, png_set_interlace_handling, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-/* Invert monochrome files */
-PNG_EXPORT(46, void, png_set_invert_mono, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Handle alpha and tRNS by replacing with a background color.  Prior to
- * libpng-1.5.4 this API must not be called before the PNG file header has been
- * read.  Doing so will result in unexpected behavior and possible warnings or
- * errors if the PNG file contains a bKGD chunk.
- */
-PNG_FP_EXPORT(47, void, png_set_background, (png_structrp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, double background_gamma))
-PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structrp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, png_fixed_point background_gamma))
-#endif
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-#  define PNG_BACKGROUND_GAMMA_UNKNOWN 0
-#  define PNG_BACKGROUND_GAMMA_SCREEN  1
-#  define PNG_BACKGROUND_GAMMA_FILE    2
-#  define PNG_BACKGROUND_GAMMA_UNIQUE  3
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-/* Scale a 16-bit depth file down to 8-bit, accurately. */
-PNG_EXPORT(229, void, png_set_scale_16, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_16_TO_8 SUPPORTED /* Name prior to 1.5.4 */
-/* Strip the second byte of information from a 16-bit depth file. */
-PNG_EXPORT(48, void, png_set_strip_16, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-/* Turn on quantizing, and reduce the palette to the number of colors
- * available.
- */
-PNG_EXPORT(49, void, png_set_quantize, (png_structrp png_ptr,
-    png_colorp palette, int num_palette, int maximum_colors,
-    png_const_uint_16p histogram, int full_quantize));
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* The threshold on gamma processing is configurable but hard-wired into the
- * library.  The following is the floating point variant.
- */
-#define PNG_GAMMA_THRESHOLD (PNG_GAMMA_THRESHOLD_FIXED*.00001)
-
-/* Handle gamma correction. Screen_gamma=(display_exponent).
- * NOTE: this API simply sets the screen and file gamma values. It will
- * therefore override the value for gamma in a PNG file if it is called after
- * the file header has been read - use with care  - call before reading the PNG
- * file for best results!
- *
- * These routines accept the same gamma values as png_set_alpha_mode (described
- * above).  The PNG_GAMMA_ defines and PNG_DEFAULT_sRGB can be passed to either
- * API (floating point or fixed.)  Notice, however, that the 'file_gamma' value
- * is the inverse of a 'screen gamma' value.
- */
-PNG_FP_EXPORT(50, void, png_set_gamma, (png_structrp png_ptr,
-    double screen_gamma, double override_file_gamma))
-PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structrp png_ptr,
-    png_fixed_point screen_gamma, png_fixed_point override_file_gamma))
-#endif
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-/* Set how many lines between output flushes - 0 for no flushing */
-PNG_EXPORT(51, void, png_set_flush, (png_structrp png_ptr, int nrows));
-/* Flush the current PNG output buffer */
-PNG_EXPORT(52, void, png_write_flush, (png_structrp png_ptr));
-#endif
-
-/* Optional update palette with requested transformations */
-PNG_EXPORT(53, void, png_start_read_image, (png_structrp png_ptr));
-
-/* Optional call to update the users info structure */
-PNG_EXPORT(54, void, png_read_update_info, (png_structrp png_ptr,
-    png_inforp info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read one or more rows of image data. */
-PNG_EXPORT(55, void, png_read_rows, (png_structrp png_ptr, png_bytepp row,
-    png_bytepp display_row, png_uint_32 num_rows));
-#endif
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read a row of data. */
-PNG_EXPORT(56, void, png_read_row, (png_structrp png_ptr, png_bytep row,
-    png_bytep display_row));
-#endif
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the whole image into memory at once. */
-PNG_EXPORT(57, void, png_read_image, (png_structrp png_ptr, png_bytepp image));
-#endif
-
-/* Write a row of image data */
-PNG_EXPORT(58, void, png_write_row, (png_structrp png_ptr,
-    png_const_bytep row));
-
-/* Write a few rows of image data: (*row) is not written; however, the type
- * is declared as writeable to maintain compatibility with previous versions
- * of libpng and to allow the 'display_row' array from read_rows to be passed
- * unchanged to write_rows.
- */
-PNG_EXPORT(59, void, png_write_rows, (png_structrp png_ptr, png_bytepp row,
-    png_uint_32 num_rows));
-
-/* Write the image data */
-PNG_EXPORT(60, void, png_write_image, (png_structrp png_ptr, png_bytepp image));
-
-/* Write the end of the PNG file. */
-PNG_EXPORT(61, void, png_write_end, (png_structrp png_ptr,
-    png_inforp info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the end of the PNG file. */
-PNG_EXPORT(62, void, png_read_end, (png_structrp png_ptr, png_inforp info_ptr));
-#endif
-
-/* Free any memory associated with the png_info_struct */
-PNG_EXPORT(63, void, png_destroy_info_struct, (png_const_structrp png_ptr,
-    png_infopp info_ptr_ptr));
-
-/* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(64, void, png_destroy_read_struct, (png_structpp png_ptr_ptr,
-    png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
-
-/* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(65, void, png_destroy_write_struct, (png_structpp png_ptr_ptr,
-    png_infopp info_ptr_ptr));
-
-/* Set the libpng method of handling chunk CRC errors */
-PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action,
-    int ancil_action));
-
-/* Values for png_set_crc_action() say how to handle CRC errors in
- * ancillary and critical chunks, and whether to use the data contained
- * therein.  Note that it is impossible to "discard" data in a critical
- * chunk.  For versions prior to 0.90, the action was always error/quit,
- * whereas in version 0.90 and later, the action for CRC errors in ancillary
- * chunks is warn/discard.  These values should NOT be changed.
- *
- *      value                       action:critical     action:ancillary
- */
-#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */
-#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
-#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
-#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
-#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
-#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
-
-/* These functions give the user control over the scan-line filtering in
- * libpng and the compression methods used by zlib.  These functions are
- * mainly useful for testing, as the defaults should work with most users.
- * Those users who are tight on memory or want faster performance at the
- * expense of compression can modify them.  See the compression library
- * header file (zlib.h) for an explination of the compression functions.
- */
-
-/* Set the filtering method(s) used by libpng.  Currently, the only valid
- * value for "method" is 0.
- */
-PNG_EXPORT(67, void, png_set_filter, (png_structrp png_ptr, int method,
-    int filters));
-
-/* Flags for png_set_filter() to say which filters to use.  The flags
- * are chosen so that they don't conflict with real filter types
- * below, in case they are supplied instead of the #defined constants.
- * These values should NOT be changed.
- */
-#define PNG_NO_FILTERS     0x00
-#define PNG_FILTER_NONE    0x08
-#define PNG_FILTER_SUB     0x10
-#define PNG_FILTER_UP      0x20
-#define PNG_FILTER_AVG     0x40
-#define PNG_FILTER_PAETH   0x80
-#define PNG_ALL_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | \
-                         PNG_FILTER_AVG | PNG_FILTER_PAETH)
-
-/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
- * These defines should NOT be changed.
- */
-#define PNG_FILTER_VALUE_NONE  0
-#define PNG_FILTER_VALUE_SUB   1
-#define PNG_FILTER_VALUE_UP    2
-#define PNG_FILTER_VALUE_AVG   3
-#define PNG_FILTER_VALUE_PAETH 4
-#define PNG_FILTER_VALUE_LAST  5
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* EXPERIMENTAL */
-/* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_
- * defines, either the default (minimum-sum-of-absolute-differences), or
- * the experimental method (weighted-minimum-sum-of-absolute-differences).
- *
- * Weights are factors >= 1.0, indicating how important it is to keep the
- * filter type consistent between rows.  Larger numbers mean the current
- * filter is that many times as likely to be the same as the "num_weights"
- * previous filters.  This is cumulative for each previous row with a weight.
- * There needs to be "num_weights" values in "filter_weights", or it can be
- * NULL if the weights aren't being specified.  Weights have no influence on
- * the selection of the first row filter.  Well chosen weights can (in theory)
- * improve the compression for a given image.
- *
- * Costs are factors >= 1.0 indicating the relative decoding costs of a
- * filter type.  Higher costs indicate more decoding expense, and are
- * therefore less likely to be selected over a filter with lower computational
- * costs.  There needs to be a value in "filter_costs" for each valid filter
- * type (given by PNG_FILTER_VALUE_LAST), or it can be NULL if you aren't
- * setting the costs.  Costs try to improve the speed of decompression without
- * unduly increasing the compressed image size.
- *
- * A negative weight or cost indicates the default value is to be used, and
- * values in the range [0.0, 1.0) indicate the value is to remain unchanged.
- * The default values for both weights and costs are currently 1.0, but may
- * change if good general weighting/cost heuristics can be found.  If both
- * the weights and costs are set to 1.0, this degenerates the WEIGHTED method
- * to the UNWEIGHTED method, but with added encoding time/computation.
- */
-PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structrp png_ptr,
-    int heuristic_method, int num_weights, png_const_doublep filter_weights,
-    png_const_doublep filter_costs))
-PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
-    (png_structrp png_ptr, int heuristic_method, int num_weights,
-    png_const_fixed_point_p filter_weights,
-    png_const_fixed_point_p filter_costs))
-#endif /* WRITE_WEIGHTED_FILTER */
-
-/* Heuristic used for row filter selection.  These defines should NOT be
- * changed.
- */
-#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
-#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
-#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
-#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
-
-#ifdef PNG_WRITE_SUPPORTED
-/* Set the library compression level.  Currently, valid values range from
- * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
- * (0 - no compression, 9 - "maximal" compression).  Note that tests have
- * shown that zlib compression levels 3-6 usually perform as well as level 9
- * for PNG images, and do considerably fewer caclulations.  In the future,
- * these values may not correspond directly to the zlib compression levels.
- */
-PNG_EXPORT(69, void, png_set_compression_level, (png_structrp png_ptr,
-    int level));
-
-PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structrp png_ptr,
-    int mem_level));
-
-PNG_EXPORT(71, void, png_set_compression_strategy, (png_structrp png_ptr,
-    int strategy));
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structrp png_ptr,
-    int window_bits));
-
-PNG_EXPORT(73, void, png_set_compression_method, (png_structrp png_ptr,
-    int method));
-#endif
-
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-/* Also set zlib parameters for compressing non-IDAT chunks */
-PNG_EXPORT(222, void, png_set_text_compression_level, (png_structrp png_ptr,
-    int level));
-
-PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structrp png_ptr,
-    int mem_level));
-
-PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structrp png_ptr,
-    int strategy));
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-PNG_EXPORT(225, void, png_set_text_compression_window_bits,
-    (png_structrp png_ptr, int window_bits));
-
-PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
-    int method));
-#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
-
-/* These next functions are called for input/output, memory, and error
- * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,
- * and call standard C I/O routines such as fread(), fwrite(), and
- * fprintf().  These functions can be made to use other I/O routines
- * at run time for those applications that need to handle I/O in a
- * different manner by calling png_set_???_fn().  See libpng-manual.txt for
- * more information.
- */
-
-#ifdef PNG_STDIO_SUPPORTED
-/* Initialize the input/output for the PNG file to the default functions. */
-PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, png_FILE_p fp));
-#endif
-
-/* Replace the (error and abort), and warning functions with user
- * supplied functions.  If no messages are to be printed you must still
- * write and use replacement functions. The replacement error_fn should
- * still do a longjmp to the last setjmp location if you are using this
- * method of error handling.  If error_fn or warning_fn is NULL, the
- * default function will be used.
- */
-
-PNG_EXPORT(75, void, png_set_error_fn, (png_structrp png_ptr,
-    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
-
-/* Return the user pointer associated with the error functions */
-PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structrp png_ptr));
-
-/* Replace the default data output functions with a user supplied one(s).
- * If buffered output is not used, then output_flush_fn can be set to NULL.
- * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
- * output_flush_fn will be ignored (and thus can be NULL).
- * It is probably a mistake to use NULL for output_flush_fn if
- * write_data_fn is not also NULL unless you have built libpng with
- * PNG_WRITE_FLUSH_SUPPORTED undefined, because in this case libpng's
- * default flush function, which uses the standard *FILE structure, will
- * be used.
- */
-PNG_EXPORT(77, void, png_set_write_fn, (png_structrp png_ptr, png_voidp io_ptr,
-    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
-
-/* Replace the default data input function with a user supplied one. */
-PNG_EXPORT(78, void, png_set_read_fn, (png_structrp png_ptr, png_voidp io_ptr,
-    png_rw_ptr read_data_fn));
-
-/* Return the user pointer associated with the I/O functions */
-PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_const_structrp png_ptr));
-
-PNG_EXPORT(80, void, png_set_read_status_fn, (png_structrp png_ptr,
-    png_read_status_ptr read_row_fn));
-
-PNG_EXPORT(81, void, png_set_write_status_fn, (png_structrp png_ptr,
-    png_write_status_ptr write_row_fn));
-
-#ifdef PNG_USER_MEM_SUPPORTED
-/* Replace the default memory allocation functions with user supplied one(s). */
-PNG_EXPORT(82, void, png_set_mem_fn, (png_structrp png_ptr, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn));
-/* Return the user pointer associated with the memory functions */
-PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structrp png_ptr,
-    png_user_transform_ptr read_user_transform_fn));
-#endif
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structrp png_ptr,
-    png_user_transform_ptr write_user_transform_fn));
-#endif
-
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-PNG_EXPORT(86, void, png_set_user_transform_info, (png_structrp png_ptr,
-    png_voidp user_transform_ptr, int user_transform_depth,
-    int user_transform_channels));
-/* Return the user pointer associated with the user transform functions */
-PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
-    (png_const_structrp png_ptr));
-#endif
-
-#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
-/* Return information about the row currently being processed.  Note that these
- * APIs do not fail but will return unexpected results if called outside a user
- * transform callback.  Also note that when transforming an interlaced image the
- * row number is the row number within the sub-image of the interlace pass, so
- * the value will increase to the height of the sub-image (not the full image)
- * then reset to 0 for the next pass.
- *
- * Use PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to
- * find the output pixel (x,y) given an interlaced sub-image pixel
- * (row,col,pass).  (See below for these macros.)
- */
-PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structrp));
-PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp));
-#endif
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-/* This callback is called only for *unknown* chunks.  If
- * PNG_HANDLE_AS_UNKNOWN_SUPPORTED is set then it is possible to set known
- * chunks to be treated as unknown, however in this case the callback must do
- * any processing required by the chunk (e.g. by calling the appropriate
- * png_set_ APIs.)
- *
- * There is no write support - on write, by default, all the chunks in the
- * 'unknown' list are written in the specified position.
- *
- * The integer return from the callback function is interpreted thus:
- *
- * negative: An error occured, png_chunk_error will be called.
- *     zero: The chunk was not handled, the chunk will be saved. A critical
- *           chunk will cause an error at this point unless it is to be saved.
- * positive: The chunk was handled, libpng will ignore/discard it.
- *
- * See "INTERACTION WTIH USER CHUNK CALLBACKS" below for important notes about
- * how this behavior will change in libpng 1.7
- */
-PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structrp png_ptr,
-    png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structrp png_ptr));
-#endif
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-/* Sets the function callbacks for the push reader, and a pointer to a
- * user-defined structure available to the callback functions.
- */
-PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structrp png_ptr,
-    png_voidp progressive_ptr, png_progressive_info_ptr info_fn,
-    png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));
-
-/* Returns the user pointer associated with the push read functions */
-PNG_EXPORT(91, png_voidp, png_get_progressive_ptr,
-    (png_const_structrp png_ptr));
-
-/* Function to be called when data becomes available */
-PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,
-    png_inforp info_ptr, png_bytep buffer, png_size_t buffer_size));
-
-/* A function which may be called *only* within png_process_data to stop the
- * processing of any more data.  The function returns the number of bytes
- * remaining, excluding any that libpng has cached internally.  A subsequent
- * call to png_process_data must supply these bytes again.  If the argument
- * 'save' is set to true the routine will first save all the pending data and
- * will always return 0.
- */
-PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structrp, int save));
-
-/* A function which may be called *only* outside (after) a call to
- * png_process_data.  It returns the number of bytes of data to skip in the
- * input.  Normally it will return 0, but if it returns a non-zero value the
- * application must skip than number of bytes of input data and pass the
- * following data to the next call to png_process_data.
- */
-PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
-
-/* Function that combines rows.  'new_row' is a flag that should come from
- * the callback and be non-NULL if anything needs to be done; the library
- * stores its own version of the new data internally and ignores the passed
- * in value.
- */
-PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
-    png_bytep old_row, png_const_bytep new_row));
-#endif /* PROGRESSIVE_READ */
-
-PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-/* Added at libpng version 1.4.0 */
-PNG_EXPORTA(95, png_voidp, png_calloc, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-
-/* Added at libpng version 1.2.4 */
-PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-
-/* Frees a pointer allocated by png_malloc() */
-PNG_EXPORT(97, void, png_free, (png_const_structrp png_ptr, png_voidp ptr));
-
-/* Free data that was allocated internally */
-PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 free_me, int num));
-
-/* Reassign responsibility for freeing existing data, whether allocated
- * by libpng or by the application; this works on the png_info structure passed
- * in, it does not change the state for other png_info structures.
- *
- * It is unlikely that this function works correctly as of 1.6.0 and using it
- * may result either in memory leaks or double free of allocated data.
- */
-PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int freer, png_uint_32 mask));
-
-/* Assignments for png_data_freer */
-#define PNG_DESTROY_WILL_FREE_DATA 1
-#define PNG_SET_WILL_FREE_DATA 1
-#define PNG_USER_WILL_FREE_DATA 2
-/* Flags for png_ptr->free_me and info_ptr->free_me */
-#define PNG_FREE_HIST 0x0008
-#define PNG_FREE_ICCP 0x0010
-#define PNG_FREE_SPLT 0x0020
-#define PNG_FREE_ROWS 0x0040
-#define PNG_FREE_PCAL 0x0080
-#define PNG_FREE_SCAL 0x0100
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-#  define PNG_FREE_UNKN 0x0200
-#endif
-/*      PNG_FREE_LIST 0x0400    removed in 1.6.0 because it is ignored */
-#define PNG_FREE_PLTE 0x1000
-#define PNG_FREE_TRNS 0x2000
-#define PNG_FREE_TEXT 0x4000
-#define PNG_FREE_ALL  0x7fff
-#define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
-
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED PNG_DEPRECATED);
-PNG_EXPORTA(101, void, png_free_default, (png_const_structrp png_ptr,
-    png_voidp ptr), PNG_DEPRECATED);
-#endif
-
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(102, void, png_error, (png_const_structrp png_ptr,
-    png_const_charp error_message), PNG_NORETURN);
-
-/* The same, but the chunk name is prepended to the error string. */
-PNG_EXPORTA(103, void, png_chunk_error, (png_const_structrp png_ptr,
-    png_const_charp error_message), PNG_NORETURN);
-
-#else
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(104, void, png_err, (png_const_structrp png_ptr), PNG_NORETURN);
-#  define png_error(s1,s2) png_err(s1)
-#  define png_chunk_error(s1,s2) png_err(s1)
-#endif
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* Non-fatal error in libpng.  Can continue, but may have a problem. */
-PNG_EXPORT(105, void, png_warning, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-
-/* Non-fatal error in libpng, chunk name is prepended to message. */
-PNG_EXPORT(106, void, png_chunk_warning, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-#else
-#  define png_warning(s1,s2) ((void)(s1))
-#  define png_chunk_warning(s1,s2) ((void)(s1))
-#endif
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-/* Benign error in libpng.  Can continue, but may have a problem.
- * User can choose whether to handle as a fatal error or as a warning. */
-PNG_EXPORT(107, void, png_benign_error, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-
-#ifdef PNG_READ_SUPPORTED
-/* Same, chunk name is prepended to message (only during read) */
-PNG_EXPORT(108, void, png_chunk_benign_error, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-#endif
-
-PNG_EXPORT(109, void, png_set_benign_errors,
-    (png_structrp png_ptr, int allowed));
-#else
-#  ifdef PNG_ALLOW_BENIGN_ERRORS
-#    define png_benign_error png_warning
-#    define png_chunk_benign_error png_chunk_warning
-#  else
-#    define png_benign_error png_error
-#    define png_chunk_benign_error png_chunk_error
-#  endif
-#endif
-
-/* The png_set_<chunk> functions are for storing values in the png_info_struct.
- * Similarly, the png_get_<chunk> calls are used to read values from the
- * png_info_struct, either storing the parameters in the passed variables, or
- * setting pointers into the png_info_struct where the data is stored.  The
- * png_get_<chunk> functions return a non-zero value if the data was available
- * in info_ptr, or return zero and do not change any of the parameters if the
- * data was not available.
- *
- * These functions should be used instead of directly accessing png_info
- * to avoid problems with future changes in the size and internal layout of
- * png_info_struct.
- */
-/* Returns "flag" if chunk data is valid in info_ptr. */
-PNG_EXPORT(110, png_uint_32, png_get_valid, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 flag));
-
-/* Returns number of bytes needed to hold a transformed row. */
-PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* Returns row_pointers, which is an array of pointers to scanlines that was
- * returned from png_read_png().
- */
-PNG_EXPORT(112, png_bytepp, png_get_rows, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Set row_pointers, which is an array of pointers to scanlines for use
- * by png_write_png().
- */
-PNG_EXPORT(113, void, png_set_rows, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytepp row_pointers));
-#endif
-
-/* Returns number of color channels in image. */
-PNG_EXPORT(114, png_byte, png_get_channels, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Returns image width in pixels. */
-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image height in pixels. */
-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image bit_depth. */
-PNG_EXPORT(117, png_byte, png_get_bit_depth, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image color_type. */
-PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image filter_type. */
-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image interlace_type. */
-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image compression_type. */
-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image resolution in pixels per meter, from pHYs chunk data. */
-PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
-PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-
-/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
-PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-#endif /* EASY_ACCESS */
-
-#ifdef PNG_READ_SUPPORTED
-/* Returns pointer to signature string read from PNG header */
-PNG_EXPORT(130, png_const_bytep, png_get_signature, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(131, png_uint_32, png_get_bKGD, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_color_16p *background));
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(132, void, png_set_bKGD, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_color_16p background));
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *white_x, double *white_y, double *red_x,
-    double *red_y, double *green_x, double *green_y, double *blue_x,
-    double *blue_y))
-PNG_FP_EXPORT(230, png_uint_32, png_get_cHRM_XYZ, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *red_X, double *red_Y, double *red_Z,
-    double *green_X, double *green_Y, double *green_Z, double *blue_X,
-    double *blue_Y, double *blue_Z))
-PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *int_white_x, png_fixed_point *int_white_y,
-    png_fixed_point *int_red_x, png_fixed_point *int_red_y,
-    png_fixed_point *int_green_x, png_fixed_point *int_green_y,
-    png_fixed_point *int_blue_x, png_fixed_point *int_blue_y))
-PNG_FIXED_EXPORT(231, png_uint_32, png_get_cHRM_XYZ_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-    png_fixed_point *int_blue_Z))
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(135, void, png_set_cHRM, (png_const_structrp png_ptr,
-    png_inforp info_ptr,
-    double white_x, double white_y, double red_x, double red_y, double green_x,
-    double green_y, double blue_x, double blue_y))
-PNG_FP_EXPORT(232, void, png_set_cHRM_XYZ, (png_const_structrp png_ptr,
-    png_inforp info_ptr, double red_X, double red_Y, double red_Z,
-    double green_X, double green_Y, double green_Z, double blue_X,
-    double blue_Y, double blue_Z))
-PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_white_x,
-    png_fixed_point int_white_y, png_fixed_point int_red_x,
-    png_fixed_point int_red_y, png_fixed_point int_green_x,
-    png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y))
-PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,
-    png_fixed_point int_red_Z, png_fixed_point int_green_X,
-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,
-    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
-    png_fixed_point int_blue_Z))
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *file_gamma))
-PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *int_file_gamma))
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_const_structrp png_ptr,
-    png_inforp info_ptr, double file_gamma))
-PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_file_gamma))
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(141, png_uint_32, png_get_hIST, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_16p *hist));
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(142, void, png_set_hIST, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_uint_16p hist));
-#endif
-
-PNG_EXPORT(143, png_uint_32, png_get_IHDR, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *width, png_uint_32 *height,
-    int *bit_depth, int *color_type, int *interlace_method,
-    int *compression_method, int *filter_method));
-
-PNG_EXPORT(144, void, png_set_IHDR, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_method, int compression_method,
-    int filter_method));
-
-#ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(145, png_uint_32, png_get_oFFs, (png_const_structrp png_ptr,
-   png_const_inforp info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
-   int *unit_type));
-#endif
-
-#ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(146, void, png_set_oFFs, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_int_32 offset_x, png_int_32 offset_y,
-    int unit_type));
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(147, png_uint_32, png_get_pCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_charp *purpose, png_int_32 *X0,
-    png_int_32 *X1, int *type, int *nparams, png_charp *units,
-    png_charpp *params));
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(148, void, png_set_pCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_charp purpose, png_int_32 X0, png_int_32 X1,
-    int type, int nparams, png_const_charp units, png_charpp params));
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(149, png_uint_32, png_get_pHYs, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(150, void, png_set_pHYs, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
-#endif
-
-PNG_EXPORT(151, png_uint_32, png_get_PLTE, (png_const_structrp png_ptr,
-   png_inforp info_ptr, png_colorp *palette, int *num_palette));
-
-PNG_EXPORT(152, void, png_set_PLTE, (png_structrp png_ptr,
-    png_inforp info_ptr, png_const_colorp palette, int num_palette));
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(153, png_uint_32, png_get_sBIT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_color_8p *sig_bit));
-#endif
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(154, void, png_set_sBIT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_color_8p sig_bit));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, int *file_srgb_intent));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(156, void, png_set_sRGB, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int srgb_intent));
-PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int srgb_intent));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(158, png_uint_32, png_get_iCCP, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_charpp name, int *compression_type,
-    png_bytepp profile, png_uint_32 *proflen));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(159, void, png_set_iCCP, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_charp name, int compression_type,
-    png_const_bytep profile, png_uint_32 proflen));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(160, int, png_get_sPLT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_sPLT_tpp entries));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(161, void, png_set_sPLT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_sPLT_tp entries, int nentries));
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_get_text also returns the number of text chunks in *num_text */
-PNG_EXPORT(162, int, png_get_text, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_textp *text_ptr, int *num_text));
-#endif
-
-/* Note while png_set_text() will accept a structure whose text,
- * language, and  translated keywords are NULL pointers, the structure
- * returned by png_get_text will always contain regular
- * zero-terminated C strings.  They might be empty strings but
- * they will never be NULL pointers.
- */
-
-#ifdef PNG_TEXT_SUPPORTED
-PNG_EXPORT(163, void, png_set_text, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_textp text_ptr, int num_text));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(164, png_uint_32, png_get_tIME, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_timep *mod_time));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(165, void, png_set_tIME, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_timep mod_time));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(166, png_uint_32, png_get_tRNS, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytep *trans_alpha, int *num_trans,
-    png_color_16p *trans_color));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(167, void, png_set_tRNS, (png_structrp png_ptr,
-    png_inforp info_ptr, png_const_bytep trans_alpha, int num_trans,
-    png_const_color_16p trans_color));
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, int *unit, double *width, double *height))
-#if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \
-   defined(PNG_FLOATING_POINT_SUPPORTED)
-/* NOTE: this API is currently implemented using floating point arithmetic,
- * consequently it can only be used on systems with floating point support.
- * In any case the range of values supported by png_fixed_point is small and it
- * is highly recommended that png_get_sCAL_s be used instead.
- */
-PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
-    png_fixed_point *width, png_fixed_point *height))
-#endif
-PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
-    png_charpp swidth, png_charpp sheight));
-
-PNG_FP_EXPORT(170, void, png_set_sCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int unit, double width, double height))
-PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
-   png_inforp info_ptr, int unit, png_fixed_point width,
-   png_fixed_point height))
-PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int unit,
-    png_const_charp swidth, png_const_charp sheight));
-#endif /* sCAL */
-
-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-/* Provide the default handling for all unknown chunks or, optionally, for
- * specific unknown chunks.
- *
- * NOTE: prior to 1.6.0 the handling specified for particular chunks on read was
- * ignored and the default was used, the per-chunk setting only had an effect on
- * write.  If you wish to have chunk-specific handling on read in code that must
- * work on earlier versions you must use a user chunk callback to specify the
- * desired handling (keep or discard.)
- *
- * The 'keep' parameter is a PNG_HANDLE_CHUNK_ value as listed below.  The
- * parameter is interpreted as follows:
- *
- * READ:
- *    PNG_HANDLE_CHUNK_AS_DEFAULT:
- *       Known chunks: do normal libpng processing, do not keep the chunk (but
- *          see the comments below about PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
- *       Unknown chunks: for a specific chunk use the global default, when used
- *          as the default discard the chunk data.
- *    PNG_HANDLE_CHUNK_NEVER:
- *       Discard the chunk data.
- *    PNG_HANDLE_CHUNK_IF_SAFE:
- *       Keep the chunk data if the chunk is not critical else raise a chunk
- *       error.
- *    PNG_HANDLE_CHUNK_ALWAYS:
- *       Keep the chunk data.
- *
- * If the chunk data is saved it can be retrieved using png_get_unknown_chunks,
- * below.  Notice that specifying "AS_DEFAULT" as a global default is equivalent
- * to specifying "NEVER", however when "AS_DEFAULT" is used for specific chunks
- * it simply resets the behavior to the libpng default.
- *
- * INTERACTION WTIH USER CHUNK CALLBACKS:
- * The per-chunk handling is always used when there is a png_user_chunk_ptr
- * callback and the callback returns 0; the chunk is then always stored *unless*
- * it is critical and the per-chunk setting is other than ALWAYS.  Notice that
- * the global default is *not* used in this case.  (In effect the per-chunk
- * value is incremented to at least IF_SAFE.)
- *
- * IMPORTANT NOTE: this behavior will change in libpng 1.7 - the global and
- * per-chunk defaults will be honored.  If you want to preserve the current
- * behavior when your callback returns 0 you must set PNG_HANDLE_CHUNK_IF_SAFE
- * as the default - if you don't do this libpng 1.6 will issue a warning.
- *
- * If you want unhandled unknown chunks to be discarded in libpng 1.6 and
- * earlier simply return '1' (handled).
- *
- * PNG_HANDLE_AS_UNKNOWN_SUPPORTED:
- *    If this is *not* set known chunks will always be handled by libpng and
- *    will never be stored in the unknown chunk list.  Known chunks listed to
- *    png_set_keep_unknown_chunks will have no effect.  If it is set then known
- *    chunks listed with a keep other than AS_DEFAULT will *never* be processed
- *    by libpng, in addition critical chunks must either be processed by the
- *    callback or saved.
- *
- *    The IHDR and IEND chunks must not be listed.  Because this turns off the
- *    default handling for chunks that would otherwise be recognized the
- *    behavior of libpng transformations may well become incorrect!
- *
- * WRITE:
- *    When writing chunks the options only apply to the chunks specified by
- *    png_set_unknown_chunks (below), libpng will *always* write known chunks
- *    required by png_set_ calls and will always write the core critical chunks
- *    (as required for PLTE).
- *
- *    Each chunk in the png_set_unknown_chunks list is looked up in the
- *    png_set_keep_unknown_chunks list to find the keep setting, this is then
- *    interpreted as follows:
- *
- *    PNG_HANDLE_CHUNK_AS_DEFAULT:
- *       Write safe-to-copy chunks and write other chunks if the global
- *       default is set to _ALWAYS, otherwise don't write this chunk.
- *    PNG_HANDLE_CHUNK_NEVER:
- *       Do not write the chunk.
- *    PNG_HANDLE_CHUNK_IF_SAFE:
- *       Write the chunk if it is safe-to-copy, otherwise do not write it.
- *    PNG_HANDLE_CHUNK_ALWAYS:
- *       Write the chunk.
- *
- * Note that the default behavior is effectively the opposite of the read case -
- * in read unknown chunks are not stored by default, in write they are written
- * by default.  Also the behavior of PNG_HANDLE_CHUNK_IF_SAFE is very different
- * - on write the safe-to-copy bit is checked, on read the critical bit is
- * checked and on read if the chunk is critical an error will be raised.
- *
- * num_chunks:
- * ===========
- *    If num_chunks is positive, then the "keep" parameter specifies the manner
- *    for handling only those chunks appearing in the chunk_list array,
- *    otherwise the chunk list array is ignored.
- *
- *    If num_chunks is 0 the "keep" parameter specifies the default behavior for
- *    unknown chunks, as described above.
- *
- *    If num_chunks is negative, then the "keep" parameter specifies the manner
- *    for handling all unknown chunks plus all chunks recognized by libpng
- *    except for the IHDR, PLTE, tRNS, IDAT, and IEND chunks (which continue to
- *    be processed by libpng.
- */
-PNG_EXPORT(172, void, png_set_keep_unknown_chunks, (png_structrp png_ptr,
-    int keep, png_const_bytep chunk_list, int num_chunks));
-
-/* The "keep" PNG_HANDLE_CHUNK_ parameter for the specified chunk is returned;
- * the result is therefore true (non-zero) if special handling is required,
- * false for the default handling.
- */
-PNG_EXPORT(173, int, png_handle_as_unknown, (png_const_structrp png_ptr,
-    png_const_bytep chunk_name));
-#endif
-
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-PNG_EXPORT(174, void, png_set_unknown_chunks, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_unknown_chunkp unknowns,
-    int num_unknowns));
-   /* NOTE: prior to 1.6.0 this routine set the 'location' field of the added
-    * unknowns to the location currently stored in the png_struct.  This is
-    * invariably the wrong value on write.  To fix this call the following API
-    * for each chunk in the list with the correct location.  If you know your
-    * code won't be compiled on earlier versions you can rely on
-    * png_set_unknown_chunks(write-ptr, png_get_unknown_chunks(read-ptr)) doing
-    * the correct thing.
-    */
-
-PNG_EXPORT(175, void, png_set_unknown_chunk_location,
-    (png_const_structrp png_ptr, png_inforp info_ptr, int chunk, int location));
-
-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_unknown_chunkpp entries));
-#endif
-
-/* Png_free_data() will turn off the "valid" flag for anything it frees.
- * If you need to turn it off for a chunk that your application has freed,
- * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);
- */
-PNG_EXPORT(177, void, png_set_invalid, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int mask));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* The "params" pointer is currently not used and is for future expansion. */
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-PNG_EXPORT(178, void, png_read_png, (png_structrp png_ptr, png_inforp info_ptr,
-    int transforms, png_voidp params));
-#endif
-#ifdef PNG_WRITE_SUPPORTED
-PNG_EXPORT(179, void, png_write_png, (png_structrp png_ptr, png_inforp info_ptr,
-    int transforms, png_voidp params));
-#endif
-#endif
-
-PNG_EXPORT(180, png_const_charp, png_get_copyright,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(181, png_const_charp, png_get_header_ver,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(182, png_const_charp, png_get_header_version,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
-    (png_const_structrp png_ptr));
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structrp png_ptr,
-    png_uint_32 mng_features_permitted));
-#endif
-
-/* For use in png_set_keep_unknown, added to version 1.2.6 */
-#define PNG_HANDLE_CHUNK_AS_DEFAULT   0
-#define PNG_HANDLE_CHUNK_NEVER        1
-#define PNG_HANDLE_CHUNK_IF_SAFE      2
-#define PNG_HANDLE_CHUNK_ALWAYS       3
-#define PNG_HANDLE_CHUNK_LAST         4
-
-/* Strip the prepended error numbers ("#nnn ") from error and warning
- * messages before passing them to the error or warning handler.
- */
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-PNG_EXPORT(185, void, png_set_strip_error_numbers, (png_structrp png_ptr,
-    png_uint_32 strip_mode));
-#endif
-
-/* Added in libpng-1.2.6 */
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-PNG_EXPORT(186, void, png_set_user_limits, (png_structrp png_ptr,
-    png_uint_32 user_width_max, png_uint_32 user_height_max));
-PNG_EXPORT(187, png_uint_32, png_get_user_width_max,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
-    (png_const_structrp png_ptr));
-/* Added in libpng-1.4.0 */
-PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structrp png_ptr,
-    png_uint_32 user_chunk_cache_max));
-PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
-    (png_const_structrp png_ptr));
-/* Added in libpng-1.4.1 */
-PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structrp png_ptr,
-    png_alloc_size_t user_chunk_cache_max));
-PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-    (png_const_structrp png_ptr));
-#endif
-
-#if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-#endif
-
-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr))
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-#endif
-
-#  ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
-#  endif /* pHYs */
-#endif  /* INCH_CONVERSIONS */
-
-/* Added in libpng-1.4.0 */
-#ifdef PNG_IO_STATE_SUPPORTED
-PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_const_structrp png_ptr));
-
-/* Removed from libpng 1.6; use png_get_io_chunk_type. */
-PNG_REMOVED(200, png_const_bytep, png_get_io_chunk_name, (png_structrp png_ptr),
-    PNG_DEPRECATED)
-
-PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
-    (png_const_structrp png_ptr));
-
-/* The flags returned by png_get_io_state() are the following: */
-#  define PNG_IO_NONE        0x0000   /* no I/O at this moment */
-#  define PNG_IO_READING     0x0001   /* currently reading */
-#  define PNG_IO_WRITING     0x0002   /* currently writing */
-#  define PNG_IO_SIGNATURE   0x0010   /* currently at the file signature */
-#  define PNG_IO_CHUNK_HDR   0x0020   /* currently at the chunk header */
-#  define PNG_IO_CHUNK_DATA  0x0040   /* currently at the chunk data */
-#  define PNG_IO_CHUNK_CRC   0x0080   /* currently at the chunk crc */
-#  define PNG_IO_MASK_OP     0x000f   /* current operation: reading/writing */
-#  define PNG_IO_MASK_LOC    0x00f0   /* current location: sig/hdr/data/crc */
-#endif /* IO_STATE */
-
-/* Interlace support.  The following macros are always defined so that if
- * libpng interlace handling is turned off the macros may be used to handle
- * interlaced images within the application.
- */
-#define PNG_INTERLACE_ADAM7_PASSES 7
-
-/* Two macros to return the first row and first column of the original,
- * full, image which appears in a given pass.  'pass' is in the range 0
- * to 6 and the result is in the range 0 to 7.
- */
-#define PNG_PASS_START_ROW(pass) (((1&~(pass))<<(3-((pass)>>1)))&7)
-#define PNG_PASS_START_COL(pass) (((1& (pass))<<(3-(((pass)+1)>>1)))&7)
-
-/* A macro to return the offset between pixels in the output row for a pair of
- * pixels in the input - effectively the inverse of the 'COL_SHIFT' macro that
- * follows.  Note that ROW_OFFSET is the offset from one row to the next whereas
- * COL_OFFSET is from one column to the next, within a row.
- */
-#define PNG_PASS_ROW_OFFSET(pass) ((pass)>2?(8>>(((pass)-1)>>1)):8)
-#define PNG_PASS_COL_OFFSET(pass) (1<<((7-(pass))>>1))
-
-/* Two macros to help evaluate the number of rows or columns in each
- * pass.  This is expressed as a shift - effectively log2 of the number or
- * rows or columns in each 8x8 tile of the original image.
- */
-#define PNG_PASS_ROW_SHIFT(pass) ((pass)>2?(8-(pass))>>1:3)
-#define PNG_PASS_COL_SHIFT(pass) ((pass)>1?(7-(pass))>>1:3)
-
-/* Hence two macros to determine the number of rows or columns in a given
- * pass of an image given its height or width.  In fact these macros may
- * return non-zero even though the sub-image is empty, because the other
- * dimension may be empty for a small image.
- */
-#define PNG_PASS_ROWS(height, pass) (((height)+(((1<<PNG_PASS_ROW_SHIFT(pass))\
-   -1)-PNG_PASS_START_ROW(pass)))>>PNG_PASS_ROW_SHIFT(pass))
-#define PNG_PASS_COLS(width, pass) (((width)+(((1<<PNG_PASS_COL_SHIFT(pass))\
-   -1)-PNG_PASS_START_COL(pass)))>>PNG_PASS_COL_SHIFT(pass))
-
-/* For the reader row callbacks (both progressive and sequential) it is
- * necessary to find the row in the output image given a row in an interlaced
- * image, so two more macros:
- */
-#define PNG_ROW_FROM_PASS_ROW(y_in, pass) \
-   (((y_in)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
-#define PNG_COL_FROM_PASS_COL(x_in, pass) \
-   (((x_in)<<PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))
-
-/* Two macros which return a boolean (0 or 1) saying whether the given row
- * or column is in a particular pass.  These use a common utility macro that
- * returns a mask for a given pass - the offset 'off' selects the row or
- * column version.  The mask has the appropriate bit set for each column in
- * the tile.
- */
-#define PNG_PASS_MASK(pass,off) ( \
-   ((0x110145AF>>(((7-(off))-(pass))<<2)) & 0xF) | \
-   ((0x01145AF0>>(((7-(off))-(pass))<<2)) & 0xF0))
-
-#define PNG_ROW_IN_INTERLACE_PASS(y, pass) \
-   ((PNG_PASS_MASK(pass,0) >> ((y)&7)) & 1)
-#define PNG_COL_IN_INTERLACE_PASS(x, pass) \
-   ((PNG_PASS_MASK(pass,1) >> ((x)&7)) & 1)
-
-#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
-/* With these routines we avoid an integer divide, which will be slower on
- * most machines.  However, it does take more operations than the corresponding
- * divide method, so it may be slower on a few RISC systems.  There are two
- * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
- *
- * Note that the rounding factors are NOT supposed to be the same!  128 and
- * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
- * standard method.
- *
- * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
- */
-
- /* fg and bg should be in `gamma 1.0' space; alpha is the opacity */
-
-#  define png_composite(composite, fg, alpha, bg)         \
-     { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \
-           * (png_uint_16)(alpha)                         \
-           + (png_uint_16)(bg)*(png_uint_16)(255          \
-           - (png_uint_16)(alpha)) + 128);                \
-       (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
-
-#  define png_composite_16(composite, fg, alpha, bg)       \
-     { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg)  \
-           * (png_uint_32)(alpha)                          \
-           + (png_uint_32)(bg)*(65535                      \
-           - (png_uint_32)(alpha)) + 32768);               \
-       (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
-
-#else  /* Standard method using integer division */
-
-#  define png_composite(composite, fg, alpha, bg)                          \
-     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +  \
-     (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \
-     127) / 255)
-
-#  define png_composite_16(composite, fg, alpha, bg)                         \
-     (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
-     (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) +         \
-     32767) / 65535)
-#endif /* READ_COMPOSITE_NODIV */
-
-#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
-PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));
-PNG_EXPORT(203, png_int_32, png_get_int_32, (png_const_bytep buf));
-#endif
-
-PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_const_structrp png_ptr,
-    png_const_bytep buf));
-/* No png_get_int_16 -- may be added if there's a real need for it. */
-
-/* Place a 32-bit number into a buffer in PNG byte order (big-endian). */
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(205, void, png_save_uint_32, (png_bytep buf, png_uint_32 i));
-#endif
-#ifdef PNG_SAVE_INT_32_SUPPORTED
-PNG_EXPORT(206, void, png_save_int_32, (png_bytep buf, png_int_32 i));
-#endif
-
-/* Place a 16-bit number into a buffer in PNG byte order.
- * The parameter is declared unsigned int, not png_uint_16,
- * just to avoid potential problems on pre-ANSI C compilers.
- */
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
-/* No png_save_int_16 -- may be added if there's a real need for it. */
-#endif
-
-#ifdef PNG_USE_READ_MACROS
-/* Inline macros to do direct reads of bytes from the input buffer.
- * The png_get_int_32() routine assumes we are using two's complement
- * format for negative values, which is almost certainly true.
- */
-#  define PNG_get_uint_32(buf) \
-     (((png_uint_32)(*(buf)) << 24) + \
-      ((png_uint_32)(*((buf) + 1)) << 16) + \
-      ((png_uint_32)(*((buf) + 2)) << 8) + \
-      ((png_uint_32)(*((buf) + 3))))
-
-   /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
-    * function) incorrectly returned a value of type png_uint_32.
-    */
-#  define PNG_get_uint_16(buf) \
-     ((png_uint_16) \
-      (((unsigned int)(*(buf)) << 8) + \
-       ((unsigned int)(*((buf) + 1)))))
-
-#  define PNG_get_int_32(buf) \
-     ((png_int_32)((*(buf) & 0x80) \
-      ? -((png_int_32)((png_get_uint_32(buf) ^ 0xffffffffL) + 1)) \
-      : (png_int_32)png_get_uint_32(buf)))
-
-   /* If PNG_PREFIX is defined the same thing as below happens in pnglibconf.h,
-    * but defining a macro name prefixed with PNG_PREFIX.
-    */
-#  ifndef PNG_PREFIX
-#     define png_get_uint_32(buf) PNG_get_uint_32(buf)
-#     define png_get_uint_16(buf) PNG_get_uint_16(buf)
-#     define png_get_int_32(buf)  PNG_get_int_32(buf)
-#  endif
-#else
-#  ifdef PNG_PREFIX
-      /* No macros; revert to the (redefined) function */
-#     define PNG_get_uint_32 (png_get_uint_32)
-#     define PNG_get_uint_16 (png_get_uint_16)
-#     define PNG_get_int_32  (png_get_int_32)
-#  endif
-#endif
-
-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) || \
-    defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-/*******************************************************************************
- *  SIMPLIFIED API
- *******************************************************************************
- *
- * Please read the documentation in libpng-manual.txt (TODO: write said
- * documentation) if you don't understand what follows.
- *
- * The simplified API hides the details of both libpng and the PNG file format
- * itself.  It allows PNG files to be read into a very limited number of
- * in-memory bitmap formats or to be written from the same formats.  If these
- * formats do not accomodate your needs then you can, and should, use the more
- * sophisticated APIs above - these support a wide variety of in-memory formats
- * and a wide variety of sophisticated transformations to those formats as well
- * as a wide variety of APIs to manipulate ancillary information.
- *
- * To read a PNG file using the simplified API:
- *
- * 1) Declare a 'png_image' structure (see below) on the stack and set the
- *    version field to PNG_IMAGE_VERSION.
- * 2) Call the appropriate png_image_begin_read... function.
- * 3) Set the png_image 'format' member to the required sample format.
- * 4) Allocate a buffer for the image and, if required, the color-map.
- * 5) Call png_image_finish_read to read the image and, if required, the
- *    color-map into your buffers.
- *
- * There are no restrictions on the format of the PNG input itself; all valid
- * color types, bit depths, and interlace methods are acceptable, and the
- * input image is transformed as necessary to the requested in-memory format
- * during the png_image_finish_read() step.  The only caveat is that if you
- * request a color-mapped image from a PNG that is full-color or makes
- * complex use of an alpha channel the transformation is extremely lossy and the
- * result may look terrible.
- *
- * To write a PNG file using the simplified API:
- *
- * 1) Declare a 'png_image' structure on the stack and memset() it to all zero.
- * 2) Initialize the members of the structure that describe the image, setting
- *    the 'format' member to the format of the image samples.
- * 3) Call the appropriate png_image_write... function with a pointer to the
- *    image and, if necessary, the color-map to write the PNG data.
- *
- * png_image is a structure that describes the in-memory format of an image
- * when it is being read or defines the in-memory format of an image that you
- * need to write:
- */
-#define PNG_IMAGE_VERSION 1
-
-typedef struct png_control *png_controlp;
-typedef struct
-{
-   png_controlp opaque;    /* Initialize to NULL, free with png_image_free */
-   png_uint_32  version;   /* Set to PNG_IMAGE_VERSION */
-   png_uint_32  width;     /* Image width in pixels (columns) */
-   png_uint_32  height;    /* Image height in pixels (rows) */
-   png_uint_32  format;    /* Image format as defined below */
-   png_uint_32  flags;     /* A bit mask containing informational flags */
-   png_uint_32  colormap_entries;
-                           /* Number of entries in the color-map */
-
-   /* In the event of an error or warning the following field will be set to a
-    * non-zero value and the 'message' field will contain a '\0' terminated
-    * string with the libpng error or warning message.  If both warnings and
-    * an error were encountered, only the error is recorded.  If there
-    * are multiple warnings, only the first one is recorded.
-    *
-    * The upper 30 bits of this value are reserved, the low two bits contain
-    * a value as follows:
-    */
-#  define PNG_IMAGE_WARNING 1
-#  define PNG_IMAGE_ERROR 2
-   /*
-    * The result is a two-bit code such that a value more than 1 indicates
-    * a failure in the API just called:
-    *
-    *    0 - no warning or error
-    *    1 - warning
-    *    2 - error
-    *    3 - error preceded by warning
-    */
-#  define PNG_IMAGE_FAILED(png_cntrl) ((((png_cntrl).warning_or_error)&0x03)>1)
-
-   png_uint_32  warning_or_error;
-
-   char         message[64];
-} png_image, *png_imagep;
-
-/* The samples of the image have one to four channels whose components have
- * original values in the range 0 to 1.0:
- *
- * 1: A single gray or luminance channel (G).
- * 2: A gray/luminance channel and an alpha channel (GA).
- * 3: Three red, green, blue color channels (RGB).
- * 4: Three color channels and an alpha channel (RGBA).
- *
- * The components are encoded in one of two ways:
- *
- * a) As a small integer, value 0..255, contained in a single byte.  For the
- * alpha channel the original value is simply value/255.  For the color or
- * luminance channels the value is encoded according to the sRGB specification
- * and matches the 8-bit format expected by typical display devices.
- *
- * The color/gray channels are not scaled (pre-multiplied) by the alpha
- * channel and are suitable for passing to color management software.
- *
- * b) As a value in the range 0..65535, contained in a 2-byte integer.  All
- * channels can be converted to the original value by dividing by 65535; all
- * channels are linear.  Color channels use the RGB encoding (RGB end-points) of
- * the sRGB specification.  This encoding is identified by the
- * PNG_FORMAT_FLAG_LINEAR flag below.
- *
- * When the simplified API needs to convert between sRGB and linear colorspaces,
- * the actual sRGB transfer curve defined in the sRGB specification (see the
- * article at http://en.wikipedia.org/wiki/SRGB) is used, not the gamma=1/2.2
- * approximation used elsewhere in libpng.
- *
- * When an alpha channel is present it is expected to denote pixel coverage
- * of the color or luminance channels and is returned as an associated alpha
- * channel: the color/gray channels are scaled (pre-multiplied) by the alpha
- * value.
- *
- * The samples are either contained directly in the image data, between 1 and 8
- * bytes per pixel according to the encoding, or are held in a color-map indexed
- * by bytes in the image data.  In the case of a color-map the color-map entries
- * are individual samples, encoded as above, and the image data has one byte per
- * pixel to select the relevant sample from the color-map.
- */
-
-/* PNG_FORMAT_*
- *
- * #defines to be used in png_image::format.  Each #define identifies a
- * particular layout of sample data and, if present, alpha values.  There are
- * separate defines for each of the two component encodings.
- *
- * A format is built up using single bit flag values.  All combinations are
- * valid.  Formats can be built up from the flag values or you can use one of
- * the predefined values below.  When testing formats always use the FORMAT_FLAG
- * macros to test for individual features - future versions of the library may
- * add new flags.
- *
- * When reading or writing color-mapped images the format should be set to the
- * format of the entries in the color-map then png_image_{read,write}_colormap
- * called to read or write the color-map and set the format correctly for the
- * image data.  Do not set the PNG_FORMAT_FLAG_COLORMAP bit directly!
- *
- * NOTE: libpng can be built with particular features disabled, if you see
- * compiler errors because the definition of one of the following flags has been
- * compiled out it is because libpng does not have the required support.  It is
- * possible, however, for the libpng configuration to enable the format on just
- * read or just write; in that case you may see an error at run time.  You can
- * guard against this by checking for the definition of the appropriate
- * "_SUPPORTED" macro, one of:
- *
- *    PNG_SIMPLIFIED_{READ,WRITE}_{BGR,AFIRST}_SUPPORTED
- */
-#define PNG_FORMAT_FLAG_ALPHA    0x01U /* format with an alpha channel */
-#define PNG_FORMAT_FLAG_COLOR    0x02U /* color format: otherwise grayscale */
-#define PNG_FORMAT_FLAG_LINEAR   0x04U /* 2 byte channels else 1 byte */
-#define PNG_FORMAT_FLAG_COLORMAP 0x08U /* image data is color-mapped */
-
-#ifdef PNG_FORMAT_BGR_SUPPORTED
-#  define PNG_FORMAT_FLAG_BGR    0x10U /* BGR colors, else order is RGB */
-#endif
-
-#ifdef PNG_FORMAT_AFIRST_SUPPORTED
-#  define PNG_FORMAT_FLAG_AFIRST 0x20U /* alpha channel comes first */
-#endif
-
-/* Commonly used formats have predefined macros.
- *
- * First the single byte (sRGB) formats:
- */
-#define PNG_FORMAT_GRAY 0
-#define PNG_FORMAT_GA   PNG_FORMAT_FLAG_ALPHA
-#define PNG_FORMAT_AG   (PNG_FORMAT_GA|PNG_FORMAT_FLAG_AFIRST)
-#define PNG_FORMAT_RGB  PNG_FORMAT_FLAG_COLOR
-#define PNG_FORMAT_BGR  (PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_BGR)
-#define PNG_FORMAT_RGBA (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_ALPHA)
-#define PNG_FORMAT_ARGB (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_AFIRST)
-#define PNG_FORMAT_BGRA (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_ALPHA)
-#define PNG_FORMAT_ABGR (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_AFIRST)
-
-/* Then the linear 2-byte formats.  When naming these "Y" is used to
- * indicate a luminance (gray) channel.
- */
-#define PNG_FORMAT_LINEAR_Y PNG_FORMAT_FLAG_LINEAR
-#define PNG_FORMAT_LINEAR_Y_ALPHA (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_ALPHA)
-#define PNG_FORMAT_LINEAR_RGB (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR)
-#define PNG_FORMAT_LINEAR_RGB_ALPHA \
-   (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA)
-
-/* With color-mapped formats the image data is one byte for each pixel, the byte
- * is an index into the color-map which is formatted as above.  To obtain a
- * color-mapped format it is sufficient just to add the PNG_FOMAT_FLAG_COLORMAP
- * to one of the above definitions, or you can use one of the definitions below.
- */
-#define PNG_FORMAT_RGB_COLORMAP  (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_BGR_COLORMAP  (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_RGBA_COLORMAP (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_ARGB_COLORMAP (PNG_FORMAT_ARGB|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_BGRA_COLORMAP (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_ABGR_COLORMAP (PNG_FORMAT_ABGR|PNG_FORMAT_FLAG_COLORMAP)
-
-/* PNG_IMAGE macros
- *
- * These are convenience macros to derive information from a png_image
- * structure.  The PNG_IMAGE_SAMPLE_ macros return values appropriate to the
- * actual image sample values - either the entries in the color-map or the
- * pixels in the image.  The PNG_IMAGE_PIXEL_ macros return corresponding values
- * for the pixels and will always return 1 for color-mapped formats.  The
- * remaining macros return information about the rows in the image and the
- * complete image.
- *
- * NOTE: All the macros that take a png_image::format parameter are compile time
- * constants if the format parameter is, itself, a constant.  Therefore these
- * macros can be used in array declarations and case labels where required.
- * Similarly the macros are also pre-processor constants (sizeof is not used) so
- * they can be used in #if tests.
- *
- * First the information about the samples.
- */
-#define PNG_IMAGE_SAMPLE_CHANNELS(fmt)\
-   (((fmt)&(PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA))+1)
-   /* Return the total number of channels in a given format: 1..4 */
-
-#define PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt)\
-   ((((fmt) & PNG_FORMAT_FLAG_LINEAR) >> 2)+1)
-   /* Return the size in bytes of a single component of a pixel or color-map
-    * entry (as appropriate) in the image: 1 or 2.
-    */
-
-#define PNG_IMAGE_SAMPLE_SIZE(fmt)\
-   (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt))
-   /* This is the size of the sample data for one sample.  If the image is
-    * color-mapped it is the size of one color-map entry (and image pixels are
-    * one byte in size), otherwise it is the size of one image pixel.
-    */
-
-#define PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(fmt)\
-   (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * 256)
-   /* The maximum size of the color-map required by the format expressed in a
-    * count of components.  This can be used to compile-time allocate a
-    * color-map:
-    *
-    * png_uint_16 colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(linear_fmt)];
-    *
-    * png_byte colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(sRGB_fmt)];
-    *
-    * Alternatively use the PNG_IMAGE_COLORMAP_SIZE macro below to use the
-    * information from one of the png_image_begin_read_ APIs and dynamically
-    * allocate the required memory.
-    */
-
-/* Corresponding information about the pixels */
-#define PNG_IMAGE_PIXEL_(test,fmt)\
-   (((fmt)&PNG_FORMAT_FLAG_COLORMAP)?1:test(fmt))
-
-#define PNG_IMAGE_PIXEL_CHANNELS(fmt)\
-   PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_CHANNELS,fmt)
-   /* The number of separate channels (components) in a pixel; 1 for a
-    * color-mapped image.
-    */
-
-#define PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)\
-   PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_COMPONENT_SIZE,fmt)
-   /* The size, in bytes, of each component in a pixel; 1 for a color-mapped
-    * image.
-    */
-
-#define PNG_IMAGE_PIXEL_SIZE(fmt) PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_SIZE,fmt)
-   /* The size, in bytes, of a complete pixel; 1 for a color-mapped image. */
-
-/* Information about the whole row, or whole image */
-#define PNG_IMAGE_ROW_STRIDE(image)\
-   (PNG_IMAGE_PIXEL_CHANNELS((image).format) * (image).width)
-   /* Return the total number of components in a single row of the image; this
-    * is the minimum 'row stride', the minimum count of components between each
-    * row.  For a color-mapped image this is the minimum number of bytes in a
-    * row.
-    */
-
-#define PNG_IMAGE_BUFFER_SIZE(image, row_stride)\
-   (PNG_IMAGE_PIXEL_COMPONENT_SIZE((image).format)*(image).height*(row_stride))
-   /* Return the size, in bytes, of an image buffer given a png_image and a row
-    * stride - the number of components to leave space for in each row.
-    */
-
-#define PNG_IMAGE_SIZE(image)\
-   PNG_IMAGE_BUFFER_SIZE(image, PNG_IMAGE_ROW_STRIDE(image))
-   /* Return the size, in bytes, of the image in memory given just a png_image;
-    * the row stride is the minimum stride required for the image.
-    */
-
-#define PNG_IMAGE_COLORMAP_SIZE(image)\
-   (PNG_IMAGE_SAMPLE_SIZE((image).format) * (image).colormap_entries)
-   /* Return the size, in bytes, of the color-map of this image.  If the image
-    * format is not a color-map format this will return a size sufficient for
-    * 256 entries in the given format; check PNG_FORMAT_FLAG_COLORMAP if
-    * you don't want to allocate a color-map in this case.
-    */
-
-/* PNG_IMAGE_FLAG_*
- *
- * Flags containing additional information about the image are held in the
- * 'flags' field of png_image.
- */
-#define PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB 0x01
-   /* This indicates the the RGB values of the in-memory bitmap do not
-    * correspond to the red, green and blue end-points defined by sRGB.
-    */
-
-#define PNG_IMAGE_FLAG_FAST 0x02
-   /* On write emphasise speed over compression; the resultant PNG file will be
-    * larger but will be produced significantly faster, particular for large
-    * images.  Do not use this option for images which will be distributed, only
-    * used it when producing intermediate files that will be read back in
-    * repeatedly.  For a typical 24-bit image the option will double the read
-    * speed at the cost of increasing the image size by 25%, however for many
-    * more compressible images the PNG file can be 10 times larger with only a
-    * slight speed gain.
-    */
-
-#define PNG_IMAGE_FLAG_16BIT_sRGB 0x04
-   /* On read if the image is a 16-bit per component image and there is no gAMA
-    * or sRGB chunk assume that the components are sRGB encoded.  Notice that
-    * images output by the simplified API always have gamma information; setting
-    * this flag only affects the interpretation of 16-bit images from an
-    * external source.  It is recommended that the application expose this flag
-    * to the user; the user can normally easily recognize the difference between
-    * linear and sRGB encoding.  This flag has no effect on write - the data
-    * passed to the write APIs must have the correct encoding (as defined
-    * above.)
-    *
-    * If the flag is not set (the default) input 16-bit per component data is
-    * assumed to be linear.
-    *
-    * NOTE: the flag can only be set after the png_image_begin_read_ call,
-    * because that call initializes the 'flags' field.
-    */
-
-#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-/* READ APIs
- * ---------
- *
- * The png_image passed to the read APIs must have been initialized by setting
- * the png_controlp field 'opaque' to NULL (or, safer, memset the whole thing.)
- */
-#ifdef PNG_STDIO_SUPPORTED
-PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
-   const char *file_name));
-   /* The named file is opened for read and the image header is filled in
-    * from the PNG header in the file.
-    */
-
-PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
-   FILE* file));
-   /* The PNG header is read from the stdio FILE object. */
-#endif /* STDIO */
-
-PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
-   png_const_voidp memory, png_size_t size));
-   /* The PNG header is read from the given memory buffer. */
-
-PNG_EXPORT(237, int, png_image_finish_read, (png_imagep image,
-   png_const_colorp background, void *buffer, png_int_32 row_stride,
-   void *colormap));
-   /* Finish reading the image into the supplied buffer and clean up the
-    * png_image structure.
-    *
-    * row_stride is the step, in byte or 2-byte units as appropriate,
-    * between adjacent rows.  A positive stride indicates that the top-most row
-    * is first in the buffer - the normal top-down arrangement.  A negative
-    * stride indicates that the bottom-most row is first in the buffer.
-    *
-    * background need only be supplied if an alpha channel must be removed from
-    * a png_byte format and the removal is to be done by compositing on a solid
-    * color; otherwise it may be NULL and any composition will be done directly
-    * onto the buffer.  The value is an sRGB color to use for the background,
-    * for grayscale output the green channel is used.
-    *
-    * background must be supplied when an alpha channel must be removed from a
-    * single byte color-mapped output format, in other words if:
-    *
-    * 1) The original format from png_image_begin_read_from_* had
-    *    PNG_FORMAT_FLAG_ALPHA set.
-    * 2) The format set by the application does not.
-    * 3) The format set by the application has PNG_FORMAT_FLAG_COLORMAP set and
-    *    PNG_FORMAT_FLAG_LINEAR *not* set.
-    *
-    * For linear output removing the alpha channel is always done by compositing
-    * on black and background is ignored.
-    *
-    * colormap must be supplied when PNG_FORMAT_FLAG_COLORMAP is set.  It must
-    * be at least the size (in bytes) returned by PNG_IMAGE_COLORMAP_SIZE.
-    * image->colormap_entries will be updated to the actual number of entries
-    * written to the colormap; this may be less than the original value.
-    */
-
-PNG_EXPORT(238, void, png_image_free, (png_imagep image));
-   /* Free any data allocated by libpng in image->opaque, setting the pointer to
-    * NULL.  May be called at any time after the structure is initialized.
-    */
-#endif /* SIMPLIFIED_READ */
-
-#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
-#ifdef PNG_STDIO_SUPPORTED
-/* WRITE APIS
- * ----------
- * For write you must initialize a png_image structure to describe the image to
- * be written.  To do this use memset to set the whole structure to 0 then
- * initialize fields describing your image.
- *
- * version: must be set to PNG_IMAGE_VERSION
- * opaque: must be initialized to NULL
- * width: image width in pixels
- * height: image height in rows
- * format: the format of the data (image and color-map) you wish to write
- * flags: set to 0 unless one of the defined flags applies; set
- *    PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB for color format images where the RGB
- *    values do not correspond to the colors in sRGB.
- * colormap_entries: set to the number of entries in the color-map (0 to 256)
- */
-PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,
-   const char *file, int convert_to_8bit, const void *buffer,
-   png_int_32 row_stride, const void *colormap));
-   /* Write the image to the named file. */
-
-PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
-   int convert_to_8_bit, const void *buffer, png_int_32 row_stride,
-   const void *colormap));
-   /* Write the image to the given (FILE*). */
-
-/* With both write APIs if image is in one of the linear formats with 16-bit
- * data then setting convert_to_8_bit will cause the output to be an 8-bit PNG
- * gamma encoded according to the sRGB specification, otherwise a 16-bit linear
- * encoded PNG file is written.
- *
- * With color-mapped data formats the colormap parameter point to a color-map
- * with at least image->colormap_entries encoded in the specified format.  If
- * the format is linear the written PNG color-map will be converted to sRGB
- * regardless of the convert_to_8_bit flag.
- *
- * With all APIs row_stride is handled as in the read APIs - it is the spacing
- * from one row to the next in component sized units (1 or 2 bytes) and if
- * negative indicates a bottom-up row layout in the buffer.
- *
- * Note that the write API does not support interlacing or sub-8-bit pixels.
- */
-#endif /* STDIO */
-#endif /* SIMPLIFIED_WRITE */
-/*******************************************************************************
- *  END OF SIMPLIFIED API
- ******************************************************************************/
-#endif /* SIMPLIFIED_{READ|WRITE} */
-
-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-PNG_EXPORT(242, void, png_set_check_for_invalid_index,
-    (png_structrp png_ptr, int allowed));
-#  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-#  endif
-#endif /* CHECK_FOR_INVALID_INDEX */
-
-/*******************************************************************************
- *  IMPLEMENTATION OPTIONS
- *******************************************************************************
- *
- * Support for arbitrary implementation-specific optimizations.  The API allows
- * particular options to be turned on or off.  'Option' is the number of the
- * option and 'onoff' is 0 (off) or non-0 (on).  The value returned is given
- * by the PNG_OPTION_ defines below.
- *
- * HARDWARE: normally hardware capabilites, such as the Intel SSE instructions,
- *           are detected at run time, however sometimes it may be impossible
- *           to do this in user mode, in which case it is necessary to discover
- *           the capabilities in an OS specific way.  Such capabilities are
- *           listed here when libpng has support for them and must be turned
- *           ON by the application if present.
- *
- * SOFTWARE: sometimes software optimizations actually result in performance
- *           decrease on some architectures or systems, or with some sets of
- *           PNG images.  'Software' options allow such optimizations to be
- *           selected at run time.
- */
-#ifdef PNG_SET_OPTION_SUPPORTED
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-#  define PNG_ARM_NEON   0 /* HARDWARE: ARM Neon SIMD instructions supported */
-#endif
-#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
-#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
-#define PNG_OPTION_NEXT  6 /* Next option - numbers must be even */
-
-/* Return values: NOTE: there are four values and 'off' is *not* zero */
-#define PNG_OPTION_UNSET   0 /* Unset - defaults to off */
-#define PNG_OPTION_INVALID 1 /* Option number out of range */
-#define PNG_OPTION_OFF     2
-#define PNG_OPTION_ON      3
-
-PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
-   int onoff));
-#endif /* SET_OPTION */
-
-/*******************************************************************************
- *  END OF HARDWARE AND SOFTWARE OPTIONS
- ******************************************************************************/
-
-/* Maintainer: Put new public prototypes here ^, in libpng.3, in project
- * defs, and in scripts/symbols.def.
- */
-
-/* The last ordinal number (this is the *last* one already used; the next
- * one to use is one more than this.)
- */
-#ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(244);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PNG_VERSION_INFO_ONLY */
-/* Do not put anything past this line */
-#endif /* PNG_H */
diff --git a/linux-x86/include/libpng16/pngconf.h b/linux-x86/include/libpng16/pngconf.h
deleted file mode 100644
index 03615f0..0000000
--- a/linux-x86/include/libpng16/pngconf.h
+++ /dev/null
@@ -1,644 +0,0 @@
-
-/* pngconf.h - machine configurable file for libpng
- *
- * libpng version 1.6.16,December 22, 2014
- *
- * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- */
-
-/* Any machine specific code is near the front of this file, so if you
- * are configuring libpng for a machine, you may want to read the section
- * starting here down to where it starts to typedef png_color, png_text,
- * and png_info.
- */
-
-#ifndef PNGCONF_H
-#define PNGCONF_H
-
-/* To do: Do all of this in scripts/pnglibconf.dfa */
-#ifdef PNG_SAFE_LIMITS_SUPPORTED
-#  ifdef PNG_USER_WIDTH_MAX
-#    undef PNG_USER_WIDTH_MAX
-#    define PNG_USER_WIDTH_MAX 1000000L
-#  endif
-#  ifdef PNG_USER_HEIGHT_MAX
-#    undef PNG_USER_HEIGHT_MAX
-#    define PNG_USER_HEIGHT_MAX 1000000L
-#  endif
-#  ifdef PNG_USER_CHUNK_MALLOC_MAX
-#    undef PNG_USER_CHUNK_MALLOC_MAX
-#    define PNG_USER_CHUNK_MALLOC_MAX 4000000L
-#  endif
-#  ifdef PNG_USER_CHUNK_CACHE_MAX
-#    undef PNG_USER_CHUNK_CACHE_MAX
-#    define PNG_USER_CHUNK_CACHE_MAX 128
-#  endif
-#endif
-
-#ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */
-
-/* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C
- * compiler for correct compilation.  The following header files are required by
- * the standard.  If your compiler doesn't provide these header files, or they
- * do not match the standard, you will need to provide/improve them.
- */
-#include <limits.h>
-#include <stddef.h>
-
-/* Library header files.  These header files are all defined by ISOC90; libpng
- * expects conformant implementations, however, an ISOC90 conformant system need
- * not provide these header files if the functionality cannot be implemented.
- * In this case it will be necessary to disable the relevant parts of libpng in
- * the build of pnglibconf.h.
- *
- * Prior to 1.6.0 string.h was included here; the API changes in 1.6.0 to not
- * include this unnecessary header file.
- */
-
-#ifdef PNG_STDIO_SUPPORTED
-   /* Required for the definition of FILE: */
-#  include <stdio.h>
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-   /* Required for the definition of jmp_buf and the declaration of longjmp: */
-#  include <setjmp.h>
-#endif
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-   /* Required for struct tm: */
-#  include <time.h>
-#endif
-
-#endif /* PNG_BUILDING_SYMBOL_TABLE */
-
-/* Prior to 1.6.0 it was possible to turn off 'const' in declarations using
- * PNG_NO_CONST; this is no longer supported except for data declarations which
- * apparently still cause problems in 2011 on some compilers.
- */
-#define PNG_CONST const /* backward compatibility only */
-
-/* This controls optimization of the reading of 16 and 32 bit values
- * from PNG files.  It can be set on a per-app-file basis - it
- * just changes whether a macro is used when the function is called.
- * The library builder sets the default; if read functions are not
- * built into the library the macro implementation is forced on.
- */
-#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
-#  define PNG_USE_READ_MACROS
-#endif
-#if !defined(PNG_NO_USE_READ_MACROS) && !defined(PNG_USE_READ_MACROS)
-#  if PNG_DEFAULT_READ_MACROS
-#    define PNG_USE_READ_MACROS
-#  endif
-#endif
-
-/* COMPILER SPECIFIC OPTIONS.
- *
- * These options are provided so that a variety of difficult compilers
- * can be used.  Some are fixed at build time (e.g. PNG_API_RULE
- * below) but still have compiler specific implementations, others
- * may be changed on a per-file basis when compiling against libpng.
- */
-
-/* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
- * against legacy (pre ISOC90) compilers that did not understand function
- * prototypes.  It is not required for modern C compilers.
- */
-#ifndef PNGARG
-#  define PNGARG(arglist) arglist
-#endif
-
-/* Function calling conventions.
- * =============================
- * Normally it is not necessary to specify to the compiler how to call
- * a function - it just does it - however on x86 systems derived from
- * Microsoft and Borland C compilers ('IBM PC', 'DOS', 'Windows' systems
- * and some others) there are multiple ways to call a function and the
- * default can be changed on the compiler command line.  For this reason
- * libpng specifies the calling convention of every exported function and
- * every function called via a user supplied function pointer.  This is
- * done in this file by defining the following macros:
- *
- * PNGAPI    Calling convention for exported functions.
- * PNGCBAPI  Calling convention for user provided (callback) functions.
- * PNGCAPI   Calling convention used by the ANSI-C library (required
- *           for longjmp callbacks and sometimes used internally to
- *           specify the calling convention for zlib).
- *
- * These macros should never be overridden.  If it is necessary to
- * change calling convention in a private build this can be done
- * by setting PNG_API_RULE (which defaults to 0) to one of the values
- * below to select the correct 'API' variants.
- *
- * PNG_API_RULE=0 Use PNGCAPI - the 'C' calling convention - throughout.
- *                This is correct in every known environment.
- * PNG_API_RULE=1 Use the operating system convention for PNGAPI and
- *                the 'C' calling convention (from PNGCAPI) for
- *                callbacks (PNGCBAPI).  This is no longer required
- *                in any known environment - if it has to be used
- *                please post an explanation of the problem to the
- *                libpng mailing list.
- *
- * These cases only differ if the operating system does not use the C
- * calling convention, at present this just means the above cases
- * (x86 DOS/Windows sytems) and, even then, this does not apply to
- * Cygwin running on those systems.
- *
- * Note that the value must be defined in pnglibconf.h so that what
- * the application uses to call the library matches the conventions
- * set when building the library.
- */
-
-/* Symbol export
- * =============
- * When building a shared library it is almost always necessary to tell
- * the compiler which symbols to export.  The png.h macro 'PNG_EXPORT'
- * is used to mark the symbols.  On some systems these symbols can be
- * extracted at link time and need no special processing by the compiler,
- * on other systems the symbols are flagged by the compiler and just
- * the declaration requires a special tag applied (unfortunately) in a
- * compiler dependent way.  Some systems can do either.
- *
- * A small number of older systems also require a symbol from a DLL to
- * be flagged to the program that calls it.  This is a problem because
- * we do not know in the header file included by application code that
- * the symbol will come from a shared library, as opposed to a statically
- * linked one.  For this reason the application must tell us by setting
- * the magic flag PNG_USE_DLL to turn on the special processing before
- * it includes png.h.
- *
- * Four additional macros are used to make this happen:
- *
- * PNG_IMPEXP The magic (if any) to cause a symbol to be exported from
- *            the build or imported if PNG_USE_DLL is set - compiler
- *            and system specific.
- *
- * PNG_EXPORT_TYPE(type) A macro that pre or appends PNG_IMPEXP to
- *                       'type', compiler specific.
- *
- * PNG_DLL_EXPORT Set to the magic to use during a libpng build to
- *                make a symbol exported from the DLL.  Not used in the
- *                public header files; see pngpriv.h for how it is used
- *                in the libpng build.
- *
- * PNG_DLL_IMPORT Set to the magic to force the libpng symbols to come
- *                from a DLL - used to define PNG_IMPEXP when
- *                PNG_USE_DLL is set.
- */
-
-/* System specific discovery.
- * ==========================
- * This code is used at build time to find PNG_IMPEXP, the API settings
- * and PNG_EXPORT_TYPE(), it may also set a macro to indicate the DLL
- * import processing is possible.  On Windows systems it also sets
- * compiler-specific macros to the values required to change the calling
- * conventions of the various functions.
- */
-#if defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\
-    defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-  /* Windows system (DOS doesn't support DLLs).  Includes builds under Cygwin or
-   * MinGW on any architecture currently supported by Windows.  Also includes
-   * Watcom builds but these need special treatment because they are not
-   * compatible with GCC or Visual C because of different calling conventions.
-   */
-#  if PNG_API_RULE == 2
-    /* If this line results in an error, either because __watcall is not
-     * understood or because of a redefine just below you cannot use *this*
-     * build of the library with the compiler you are using.  *This* build was
-     * build using Watcom and applications must also be built using Watcom!
-     */
-#    define PNGCAPI __watcall
-#  endif
-
-#  if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 800))
-#    define PNGCAPI __cdecl
-#    if PNG_API_RULE == 1
-       /* If this line results in an error __stdcall is not understood and
-        * PNG_API_RULE should not have been set to '1'.
-        */
-#      define PNGAPI __stdcall
-#    endif
-#  else
-    /* An older compiler, or one not detected (erroneously) above,
-     * if necessary override on the command line to get the correct
-     * variants for the compiler.
-     */
-#    ifndef PNGCAPI
-#      define PNGCAPI _cdecl
-#    endif
-#    if PNG_API_RULE == 1 && !defined(PNGAPI)
-#      define PNGAPI _stdcall
-#    endif
-#  endif /* compiler/api */
-
-  /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
-
-#  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
-#     error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"
-#  endif
-
-#  if (defined(_MSC_VER) && _MSC_VER < 800) ||\
-      (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
-    /* older Borland and MSC
-     * compilers used '__export' and required this to be after
-     * the type.
-     */
-#    ifndef PNG_EXPORT_TYPE
-#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
-#    endif
-#    define PNG_DLL_EXPORT __export
-#  else /* newer compiler */
-#    define PNG_DLL_EXPORT __declspec(dllexport)
-#    ifndef PNG_DLL_IMPORT
-#      define PNG_DLL_IMPORT __declspec(dllimport)
-#    endif
-#  endif /* compiler */
-
-#else /* !Windows */
-#  if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
-#    define PNGAPI _System
-#  else /* !Windows/x86 && !OS/2 */
-    /* Use the defaults, or define PNG*API on the command line (but
-     * this will have to be done for every compile!)
-     */
-#  endif /* other system, !OS/2 */
-#endif /* !Windows/x86 */
-
-/* Now do all the defaulting . */
-#ifndef PNGCAPI
-#  define PNGCAPI
-#endif
-#ifndef PNGCBAPI
-#  define PNGCBAPI PNGCAPI
-#endif
-#ifndef PNGAPI
-#  define PNGAPI PNGCAPI
-#endif
-
-/* PNG_IMPEXP may be set on the compilation system command line or (if not set)
- * then in an internal header file when building the library, otherwise (when
- * using the library) it is set here.
- */
-#ifndef PNG_IMPEXP
-#  if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
-     /* This forces use of a DLL, disallowing static linking */
-#    define PNG_IMPEXP PNG_DLL_IMPORT
-#  endif
-
-#  ifndef PNG_IMPEXP
-#    define PNG_IMPEXP
-#  endif
-#endif
-
-/* In 1.5.2 the definition of PNG_FUNCTION has been changed to always treat
- * 'attributes' as a storage class - the attributes go at the start of the
- * function definition, and attributes are always appended regardless of the
- * compiler.  This considerably simplifies these macros but may cause problems
- * if any compilers both need function attributes and fail to handle them as
- * a storage class (this is unlikely.)
- */
-#ifndef PNG_FUNCTION
-#  define PNG_FUNCTION(type, name, args, attributes) attributes type name args
-#endif
-
-#ifndef PNG_EXPORT_TYPE
-#  define PNG_EXPORT_TYPE(type) PNG_IMPEXP type
-#endif
-
-   /* The ordinal value is only relevant when preprocessing png.h for symbol
-    * table entries, so we discard it here.  See the .dfn files in the
-    * scripts directory.
-    */
-#ifndef PNG_EXPORTA
-
-#  define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-      PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args), \
-        extern attributes)
-#endif
-
-/* ANSI-C (C90) does not permit a macro to be invoked with an empty argument,
- * so make something non-empty to satisfy the requirement:
- */
-#define PNG_EMPTY /*empty list*/
-
-#define PNG_EXPORT(ordinal, type, name, args)\
-   PNG_EXPORTA(ordinal, type, name, args, PNG_EMPTY)
-
-/* Use PNG_REMOVED to comment out a removed interface. */
-#ifndef PNG_REMOVED
-#  define PNG_REMOVED(ordinal, type, name, args, attributes)
-#endif
-
-#ifndef PNG_CALLBACK
-#  define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)
-#endif
-
-/* Support for compiler specific function attributes.  These are used
- * so that where compiler support is available incorrect use of API
- * functions in png.h will generate compiler warnings.
- *
- * Added at libpng-1.2.41.
- */
-
-#ifndef PNG_NO_PEDANTIC_WARNINGS
-#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
-#    define PNG_PEDANTIC_WARNINGS_SUPPORTED
-#  endif
-#endif
-
-#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
-  /* Support for compiler specific function attributes.  These are used
-   * so that where compiler support is available, incorrect use of API
-   * functions in png.h will generate compiler warnings.  Added at libpng
-   * version 1.2.41.  Disabling these removes the warnings but may also produce
-   * less efficient code.
-   */
-#  if defined(__clang__) && defined(__has_attribute)
-     /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */
-#    if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__)
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    if !defined(PNG_NORETURN) && __has_attribute(__noreturn__)
-#      define PNG_NORETURN __attribute__((__noreturn__))
-#    endif
-#    if !defined(PNG_ALLOCATED) && __has_attribute(__malloc__)
-#      define PNG_ALLOCATED __attribute__((__malloc__))
-#    endif
-#    if !defined(PNG_DEPRECATED) && __has_attribute(__deprecated__)
-#      define PNG_DEPRECATED __attribute__((__deprecated__))
-#    endif
-#    if !defined(PNG_PRIVATE)
-#      ifdef __has_extension
-#        if __has_extension(attribute_unavailable_with_message)
-#          define PNG_PRIVATE __attribute__((__unavailable__(\
-             "This function is not exported by libpng.")))
-#        endif
-#      endif
-#    endif
-#    ifndef PNG_RESTRICT
-#      define PNG_RESTRICT __restrict
-#    endif
-
-#  elif defined(__GNUC__)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __attribute__((__noreturn__))
-#    endif
-#    if __GNUC__ >= 3
-#      ifndef PNG_ALLOCATED
-#        define PNG_ALLOCATED  __attribute__((__malloc__))
-#      endif
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __attribute__((__deprecated__))
-#      endif
-#      ifndef PNG_PRIVATE
-#        if 0 /* Doesn't work so we use deprecated instead*/
-#          define PNG_PRIVATE \
-            __attribute__((warning("This function is not exported by libpng.")))
-#        else
-#          define PNG_PRIVATE \
-            __attribute__((__deprecated__))
-#        endif
-#      endif
-#      if ((__GNUC__ > 3) || !defined(__GNUC_MINOR__) || (__GNUC_MINOR__ >= 1))
-#        ifndef PNG_RESTRICT
-#          define PNG_RESTRICT __restrict
-#        endif
-#      endif /* __GNUC__.__GNUC_MINOR__ > 3.0 */
-#    endif /* __GNUC__ >= 3 */
-
-#  elif defined(_MSC_VER)  && (_MSC_VER >= 1300)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT /* not supported */
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __declspec(noreturn)
-#    endif
-#    ifndef PNG_ALLOCATED
-#      if (_MSC_VER >= 1400)
-#        define PNG_ALLOCATED __declspec(restrict)
-#      endif
-#    endif
-#    ifndef PNG_DEPRECATED
-#      define PNG_DEPRECATED __declspec(deprecated)
-#    endif
-#    ifndef PNG_PRIVATE
-#      define PNG_PRIVATE __declspec(deprecated)
-#    endif
-#    ifndef PNG_RESTRICT
-#      if (_MSC_VER >= 1400)
-#        define PNG_RESTRICT __restrict
-#      endif
-#    endif
-
-#  elif defined(__WATCOMC__)
-#    ifndef PNG_RESTRICT
-#      define PNG_RESTRICT __restrict
-#    endif
-#  endif
-#endif /* PNG_PEDANTIC_WARNINGS */
-
-#ifndef PNG_DEPRECATED
-#  define PNG_DEPRECATED  /* Use of this function is deprecated */
-#endif
-#ifndef PNG_USE_RESULT
-#  define PNG_USE_RESULT  /* The result of this function must be checked */
-#endif
-#ifndef PNG_NORETURN
-#  define PNG_NORETURN    /* This function does not return */
-#endif
-#ifndef PNG_ALLOCATED
-#  define PNG_ALLOCATED   /* The result of the function is new memory */
-#endif
-#ifndef PNG_PRIVATE
-#  define PNG_PRIVATE     /* This is a private libpng function */
-#endif
-#ifndef PNG_RESTRICT
-#  define PNG_RESTRICT    /* The C99 "restrict" feature */
-#endif
-
-#ifndef PNG_FP_EXPORT     /* A floating point API. */
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-#     define PNG_FP_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args);
-#  else                   /* No floating point APIs */
-#     define PNG_FP_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-#ifndef PNG_FIXED_EXPORT  /* A fixed point API. */
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args);
-#  else                   /* No fixed point APIs */
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-
-#ifndef PNG_BUILDING_SYMBOL_TABLE
-/* Some typedefs to get us started.  These should be safe on most of the common
- * platforms.
- *
- * png_uint_32 and png_int_32 may, currently, be larger than required to hold a
- * 32-bit value however this is not normally advisable.
- *
- * png_uint_16 and png_int_16 should always be two bytes in size - this is
- * verified at library build time.
- *
- * png_byte must always be one byte in size.
- *
- * The checks below use constants from limits.h, as defined by the ISOC90
- * standard.
- */
-#if CHAR_BIT == 8 && UCHAR_MAX == 255
-   typedef unsigned char png_byte;
-#else
-#  error "libpng requires 8 bit bytes"
-#endif
-
-#if INT_MIN == -32768 && INT_MAX == 32767
-   typedef int png_int_16;
-#elif SHRT_MIN == -32768 && SHRT_MAX == 32767
-   typedef short png_int_16;
-#else
-#  error "libpng requires a signed 16 bit type"
-#endif
-
-#if UINT_MAX == 65535
-   typedef unsigned int png_uint_16;
-#elif USHRT_MAX == 65535
-   typedef unsigned short png_uint_16;
-#else
-#  error "libpng requires an unsigned 16 bit type"
-#endif
-
-#if INT_MIN < -2147483646 && INT_MAX > 2147483646
-   typedef int png_int_32;
-#elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646
-   typedef long int png_int_32;
-#else
-#  error "libpng requires a signed 32 bit (or more) type"
-#endif
-
-#if UINT_MAX > 4294967294
-   typedef unsigned int png_uint_32;
-#elif ULONG_MAX > 4294967294
-   typedef unsigned long int png_uint_32;
-#else
-#  error "libpng requires an unsigned 32 bit (or more) type"
-#endif
-
-/* Prior to 1.6.0 it was possible to disable the use of size_t, 1.6.0, however,
- * requires an ISOC90 compiler and relies on consistent behavior of sizeof.
- */
-typedef size_t png_size_t;
-typedef ptrdiff_t png_ptrdiff_t;
-
-/* libpng needs to know the maximum value of 'size_t' and this controls the
- * definition of png_alloc_size_t, below.  This maximum value of size_t limits
- * but does not control the maximum allocations the library makes - there is
- * direct application control of this through png_set_user_limits().
- */
-#ifndef PNG_SMALL_SIZE_T
-   /* Compiler specific tests for systems where size_t is known to be less than
-    * 32 bits (some of these systems may no longer work because of the lack of
-    * 'far' support; see above.)
-    */
-#  if (defined(__TURBOC__) && !defined(__FLAT__)) ||\
-   (defined(_MSC_VER) && defined(MAXSEG_64K))
-#     define PNG_SMALL_SIZE_T
-#  endif
-#endif
-
-/* png_alloc_size_t is guaranteed to be no smaller than png_size_t, and no
- * smaller than png_uint_32.  Casts from png_size_t or png_uint_32 to
- * png_alloc_size_t are not necessary; in fact, it is recommended not to use
- * them at all so that the compiler can complain when something turns out to be
- * problematic.
- *
- * Casts in the other direction (from png_alloc_size_t to png_size_t or
- * png_uint_32) should be explicitly applied; however, we do not expect to
- * encounter practical situations that require such conversions.
- *
- * PNG_SMALL_SIZE_T must be defined if the maximum value of size_t is less than
- * 4294967295 - i.e. less than the maximum value of png_uint_32.
- */
-#ifdef PNG_SMALL_SIZE_T
-   typedef png_uint_32 png_alloc_size_t;
-#else
-   typedef png_size_t png_alloc_size_t;
-#endif
-
-/* Prior to 1.6.0 libpng offered limited support for Microsoft C compiler
- * implementations of Intel CPU specific support of user-mode segmented address
- * spaces, where 16-bit pointers address more than 65536 bytes of memory using
- * separate 'segment' registers.  The implementation requires two different
- * types of pointer (only one of which includes the segment value.)
- *
- * If required this support is available in version 1.2 of libpng and may be
- * available in versions through 1.5, although the correctness of the code has
- * not been verified recently.
- */
-
-/* Typedef for floating-point numbers that are converted to fixed-point with a
- * multiple of 100,000, e.g., gamma
- */
-typedef png_int_32 png_fixed_point;
-
-/* Add typedefs for pointers */
-typedef void                  * png_voidp;
-typedef const void            * png_const_voidp;
-typedef png_byte              * png_bytep;
-typedef const png_byte        * png_const_bytep;
-typedef png_uint_32           * png_uint_32p;
-typedef const png_uint_32     * png_const_uint_32p;
-typedef png_int_32            * png_int_32p;
-typedef const png_int_32      * png_const_int_32p;
-typedef png_uint_16           * png_uint_16p;
-typedef const png_uint_16     * png_const_uint_16p;
-typedef png_int_16            * png_int_16p;
-typedef const png_int_16      * png_const_int_16p;
-typedef char                  * png_charp;
-typedef const char            * png_const_charp;
-typedef png_fixed_point       * png_fixed_point_p;
-typedef const png_fixed_point * png_const_fixed_point_p;
-typedef png_size_t            * png_size_tp;
-typedef const png_size_t      * png_const_size_tp;
-
-#ifdef PNG_STDIO_SUPPORTED
-typedef FILE            * png_FILE_p;
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double       * png_doublep;
-typedef const double * png_const_doublep;
-#endif
-
-/* Pointers to pointers; i.e. arrays */
-typedef png_byte        * * png_bytepp;
-typedef png_uint_32     * * png_uint_32pp;
-typedef png_int_32      * * png_int_32pp;
-typedef png_uint_16     * * png_uint_16pp;
-typedef png_int_16      * * png_int_16pp;
-typedef const char      * * png_const_charpp;
-typedef char            * * png_charpp;
-typedef png_fixed_point * * png_fixed_point_pp;
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          * * png_doublepp;
-#endif
-
-/* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char            * * * png_charppp;
-
-#endif /* PNG_BUILDING_SYMBOL_TABLE */
-
-#endif /* PNGCONF_H */
diff --git a/linux-x86/include/libpng16/pnglibconf.h b/linux-x86/include/libpng16/pnglibconf.h
deleted file mode 100644
index 42a195b..0000000
--- a/linux-x86/include/libpng16/pnglibconf.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* pnglibconf.h - library build configuration */
-
-/* libpng version 1.6.16,December 22, 2014 */
-
-/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
-
-/* This code is released under the libpng license. */
-/* For conditions of distribution and use, see the disclaimer */
-/* and license in png.h */
-
-/* pnglibconf.h */
-/* Machine generated file: DO NOT EDIT */
-/* Derived from: scripts/pnglibconf.dfa */
-#ifndef PNGLCONF_H
-#define PNGLCONF_H
-/* options */
-#define PNG_16BIT_SUPPORTED
-#define PNG_ALIGNED_MEMORY_SUPPORTED
-/*#undef PNG_ARM_NEON_API_SUPPORTED*/
-/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_BENIGN_READ_ERRORS_SUPPORTED
-/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
-#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_COLORSPACE_SUPPORTED
-#define PNG_CONSOLE_IO_SUPPORTED
-#define PNG_CONVERT_tIME_SUPPORTED
-#define PNG_EASY_ACCESS_SUPPORTED
-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-#define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_FLOATING_POINT_SUPPORTED
-#define PNG_FORMAT_AFIRST_SUPPORTED
-#define PNG_FORMAT_BGR_SUPPORTED
-#define PNG_GAMMA_SUPPORTED
-#define PNG_GET_PALETTE_MAX_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_IO_STATE_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_PROGRESSIVE_READ_SUPPORTED
-#define PNG_READ_16BIT_SUPPORTED
-#define PNG_READ_ALPHA_MODE_SUPPORTED
-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_READ_BACKGROUND_SUPPORTED
-#define PNG_READ_BGR_SUPPORTED
-#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
-#define PNG_READ_EXPAND_16_SUPPORTED
-#define PNG_READ_EXPAND_SUPPORTED
-#define PNG_READ_FILLER_SUPPORTED
-#define PNG_READ_GAMMA_SUPPORTED
-#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
-#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#define PNG_READ_INTERLACING_SUPPORTED
-#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-#define PNG_READ_INVERT_ALPHA_SUPPORTED
-#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
-#define PNG_READ_PACKSWAP_SUPPORTED
-#define PNG_READ_PACK_SUPPORTED
-#define PNG_READ_QUANTIZE_SUPPORTED
-#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#define PNG_READ_SCALE_16_TO_8_SUPPORTED
-#define PNG_READ_SHIFT_SUPPORTED
-#define PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_STRIP_ALPHA_SUPPORTED
-#define PNG_READ_SUPPORTED
-#define PNG_READ_SWAP_ALPHA_SUPPORTED
-#define PNG_READ_SWAP_SUPPORTED
-#define PNG_READ_TEXT_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_READ_USER_CHUNKS_SUPPORTED
-#define PNG_READ_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_bKGD_SUPPORTED
-#define PNG_READ_cHRM_SUPPORTED
-#define PNG_READ_gAMA_SUPPORTED
-#define PNG_READ_hIST_SUPPORTED
-#define PNG_READ_iCCP_SUPPORTED
-#define PNG_READ_iTXt_SUPPORTED
-#define PNG_READ_oFFs_SUPPORTED
-#define PNG_READ_pCAL_SUPPORTED
-#define PNG_READ_pHYs_SUPPORTED
-#define PNG_READ_sBIT_SUPPORTED
-#define PNG_READ_sCAL_SUPPORTED
-#define PNG_READ_sPLT_SUPPORTED
-#define PNG_READ_sRGB_SUPPORTED
-#define PNG_READ_tEXt_SUPPORTED
-#define PNG_READ_tIME_SUPPORTED
-#define PNG_READ_tRNS_SUPPORTED
-#define PNG_READ_zTXt_SUPPORTED
-/*#undef PNG_SAFE_LIMITS_SUPPORTED*/
-#define PNG_SAVE_INT_32_SUPPORTED
-#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SEQUENTIAL_READ_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-#define PNG_SET_OPTION_SUPPORTED
-#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SET_USER_LIMITS_SUPPORTED
-#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_READ_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_TEXT_SUPPORTED
-#define PNG_TIME_RFC1123_SUPPORTED
-#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
-#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_BGR_SUPPORTED
-#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-#define PNG_WRITE_FILLER_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#define PNG_WRITE_INVERT_SUPPORTED
-#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-#define PNG_WRITE_PACKSWAP_SUPPORTED
-#define PNG_WRITE_PACK_SUPPORTED
-#define PNG_WRITE_SHIFT_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#define PNG_WRITE_SWAP_SUPPORTED
-#define PNG_WRITE_TEXT_SUPPORTED
-#define PNG_WRITE_TRANSFORMS_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_bKGD_SUPPORTED
-#define PNG_WRITE_cHRM_SUPPORTED
-#define PNG_WRITE_gAMA_SUPPORTED
-#define PNG_WRITE_hIST_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_WRITE_iTXt_SUPPORTED
-#define PNG_WRITE_oFFs_SUPPORTED
-#define PNG_WRITE_pCAL_SUPPORTED
-#define PNG_WRITE_pHYs_SUPPORTED
-#define PNG_WRITE_sBIT_SUPPORTED
-#define PNG_WRITE_sCAL_SUPPORTED
-#define PNG_WRITE_sPLT_SUPPORTED
-#define PNG_WRITE_sRGB_SUPPORTED
-#define PNG_WRITE_tEXt_SUPPORTED
-#define PNG_WRITE_tIME_SUPPORTED
-#define PNG_WRITE_tRNS_SUPPORTED
-#define PNG_WRITE_zTXt_SUPPORTED
-#define PNG_bKGD_SUPPORTED
-#define PNG_cHRM_SUPPORTED
-#define PNG_gAMA_SUPPORTED
-#define PNG_hIST_SUPPORTED
-#define PNG_iCCP_SUPPORTED
-#define PNG_iTXt_SUPPORTED
-#define PNG_oFFs_SUPPORTED
-#define PNG_pCAL_SUPPORTED
-#define PNG_pHYs_SUPPORTED
-#define PNG_sBIT_SUPPORTED
-#define PNG_sCAL_SUPPORTED
-#define PNG_sPLT_SUPPORTED
-#define PNG_sRGB_SUPPORTED
-#define PNG_tEXt_SUPPORTED
-#define PNG_tIME_SUPPORTED
-#define PNG_tRNS_SUPPORTED
-#define PNG_zTXt_SUPPORTED
-/* end of options */
-/* settings */
-#define PNG_API_RULE 0
-#define PNG_COST_SHIFT 3
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
-#define PNG_INFLATE_BUF_SIZE 1024
-#define PNG_MAX_GAMMA_8 11
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
-#define PNG_WEIGHT_SHIFT 8
-#define PNG_ZBUF_SIZE 8192
-#define PNG_ZLIB_VERNUM 0x1280
-#define PNG_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
-#define PNG_Z_DEFAULT_STRATEGY 1
-#define PNG_sCAL_PRECISION 5
-#define PNG_sRGB_PROFILE_CHECKS 2
-/* end of settings */
-#endif /* PNGLCONF_H */
diff --git a/linux-x86/include/pixman-1/pixman-version.h b/linux-x86/include/pixman-1/pixman-version.h
deleted file mode 100644
index f1fdee8..0000000
--- a/linux-x86/include/pixman-1/pixman-version.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright © 2008 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Author: Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef PIXMAN_VERSION_H__
-#define PIXMAN_VERSION_H__
-
-#ifndef PIXMAN_H__
-#  error pixman-version.h should only be included by pixman.h
-#endif
-
-#define PIXMAN_VERSION_MAJOR 0
-#define PIXMAN_VERSION_MINOR 32
-#define PIXMAN_VERSION_MICRO 4
-
-#define PIXMAN_VERSION_STRING "0.32.4"
-
-#define PIXMAN_VERSION_ENCODE(major, minor, micro) (	\
-	  ((major) * 10000)				\
-	+ ((minor) *   100)				\
-	+ ((micro) *     1))
-
-#define PIXMAN_VERSION PIXMAN_VERSION_ENCODE(	\
-	PIXMAN_VERSION_MAJOR,			\
-	PIXMAN_VERSION_MINOR,			\
-	PIXMAN_VERSION_MICRO)
-
-#endif /* PIXMAN_VERSION_H__ */
diff --git a/linux-x86/include/pixman-1/pixman.h b/linux-x86/include/pixman-1/pixman.h
deleted file mode 100644
index 509ba5e..0000000
--- a/linux-x86/include/pixman-1/pixman.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/*
- * Copyright © 1998, 2004 Keith Packard
- * Copyright   2007 Red Hat, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef PIXMAN_H__
-#define PIXMAN_H__
-
-#include <pixman-version.h>
-
-#ifdef  __cplusplus
-#define PIXMAN_BEGIN_DECLS extern "C" {
-#define PIXMAN_END_DECLS }
-#else
-#define PIXMAN_BEGIN_DECLS
-#define PIXMAN_END_DECLS
-#endif
-
-PIXMAN_BEGIN_DECLS
-
-/*
- * Standard integers
- */
-
-#if !defined (PIXMAN_DONT_DEFINE_STDINT)
-
-#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi) || defined (__sun) || defined (sun) || defined (__digital__) || defined (__HP_cc)
-#  include <inttypes.h>
-/* VS 2010 (_MSC_VER 1600) has stdint.h */
-#elif defined (_MSC_VER) && _MSC_VER < 1600
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#elif defined (_AIX)
-#  include <sys/inttypes.h>
-#else
-#  include <stdint.h>
-#endif
-
-#endif
-
-/*
- * Boolean
- */
-typedef int pixman_bool_t;
-
-/*
- * Fixpoint numbers
- */
-typedef int64_t			pixman_fixed_32_32_t;
-typedef pixman_fixed_32_32_t	pixman_fixed_48_16_t;
-typedef uint32_t		pixman_fixed_1_31_t;
-typedef uint32_t		pixman_fixed_1_16_t;
-typedef int32_t			pixman_fixed_16_16_t;
-typedef pixman_fixed_16_16_t	pixman_fixed_t;
-
-#define pixman_fixed_e			((pixman_fixed_t) 1)
-#define pixman_fixed_1			(pixman_int_to_fixed(1))
-#define pixman_fixed_1_minus_e		(pixman_fixed_1 - pixman_fixed_e)
-#define pixman_fixed_minus_1		(pixman_int_to_fixed(-1))
-#define pixman_fixed_to_int(f)		((int) ((f) >> 16))
-#define pixman_int_to_fixed(i)		((pixman_fixed_t) ((i) << 16))
-#define pixman_fixed_to_double(f)	(double) ((f) / (double) pixman_fixed_1)
-#define pixman_double_to_fixed(d)	((pixman_fixed_t) ((d) * 65536.0))
-#define pixman_fixed_frac(f)		((f) & pixman_fixed_1_minus_e)
-#define pixman_fixed_floor(f)		((f) & ~pixman_fixed_1_minus_e)
-#define pixman_fixed_ceil(f)		pixman_fixed_floor ((f) + pixman_fixed_1_minus_e)
-#define pixman_fixed_fraction(f)	((f) & pixman_fixed_1_minus_e)
-#define pixman_fixed_mod_2(f)		((f) & (pixman_fixed1 | pixman_fixed_1_minus_e))
-#define pixman_max_fixed_48_16		((pixman_fixed_48_16_t) 0x7fffffff)
-#define pixman_min_fixed_48_16		(-((pixman_fixed_48_16_t) 1 << 31))
-
-/*
- * Misc structs
- */
-typedef struct pixman_color pixman_color_t;
-typedef struct pixman_point_fixed pixman_point_fixed_t;
-typedef struct pixman_line_fixed pixman_line_fixed_t;
-typedef struct pixman_vector pixman_vector_t;
-typedef struct pixman_transform pixman_transform_t;
-
-struct pixman_color
-{
-    uint16_t	red;
-    uint16_t    green;
-    uint16_t    blue;
-    uint16_t    alpha;
-};
-
-struct pixman_point_fixed
-{
-    pixman_fixed_t	x;
-    pixman_fixed_t	y;
-};
-
-struct pixman_line_fixed
-{
-    pixman_point_fixed_t	p1, p2;
-};
-
-/*
- * Fixed point matrices
- */
-
-struct pixman_vector
-{
-    pixman_fixed_t	vector[3];
-};
-
-struct pixman_transform
-{
-    pixman_fixed_t	matrix[3][3];
-};
-
-/* forward declaration (sorry) */
-struct pixman_box16;
-typedef  union pixman_image		pixman_image_t;
-
-void          pixman_transform_init_identity    (struct pixman_transform       *matrix);
-pixman_bool_t pixman_transform_point_3d         (const struct pixman_transform *transform,
-						 struct pixman_vector          *vector);
-pixman_bool_t pixman_transform_point            (const struct pixman_transform *transform,
-						 struct pixman_vector          *vector);
-pixman_bool_t pixman_transform_multiply         (struct pixman_transform       *dst,
-						 const struct pixman_transform *l,
-						 const struct pixman_transform *r);
-void          pixman_transform_init_scale       (struct pixman_transform       *t,
-						 pixman_fixed_t                 sx,
-						 pixman_fixed_t                 sy);
-pixman_bool_t pixman_transform_scale            (struct pixman_transform       *forward,
-						 struct pixman_transform       *reverse,
-						 pixman_fixed_t                 sx,
-						 pixman_fixed_t                 sy);
-void          pixman_transform_init_rotate      (struct pixman_transform       *t,
-						 pixman_fixed_t                 cos,
-						 pixman_fixed_t                 sin);
-pixman_bool_t pixman_transform_rotate           (struct pixman_transform       *forward,
-						 struct pixman_transform       *reverse,
-						 pixman_fixed_t                 c,
-						 pixman_fixed_t                 s);
-void          pixman_transform_init_translate   (struct pixman_transform       *t,
-						 pixman_fixed_t                 tx,
-						 pixman_fixed_t                 ty);
-pixman_bool_t pixman_transform_translate        (struct pixman_transform       *forward,
-						 struct pixman_transform       *reverse,
-						 pixman_fixed_t                 tx,
-						 pixman_fixed_t                 ty);
-pixman_bool_t pixman_transform_bounds           (const struct pixman_transform *matrix,
-						 struct pixman_box16           *b);
-pixman_bool_t pixman_transform_invert           (struct pixman_transform       *dst,
-						 const struct pixman_transform *src);
-pixman_bool_t pixman_transform_is_identity      (const struct pixman_transform *t);
-pixman_bool_t pixman_transform_is_scale         (const struct pixman_transform *t);
-pixman_bool_t pixman_transform_is_int_translate (const struct pixman_transform *t);
-pixman_bool_t pixman_transform_is_inverse       (const struct pixman_transform *a,
-						 const struct pixman_transform *b);
-
-/*
- * Floating point matrices
- */
-typedef struct pixman_f_transform pixman_f_transform_t;
-typedef struct pixman_f_vector pixman_f_vector_t;
-
-struct pixman_f_vector
-{
-    double  v[3];
-};
-
-struct pixman_f_transform
-{
-    double  m[3][3];
-};
-
-pixman_bool_t pixman_transform_from_pixman_f_transform (struct pixman_transform         *t,
-							const struct pixman_f_transform *ft);
-void          pixman_f_transform_from_pixman_transform (struct pixman_f_transform       *ft,
-							const struct pixman_transform   *t);
-pixman_bool_t pixman_f_transform_invert                (struct pixman_f_transform       *dst,
-							const struct pixman_f_transform *src);
-pixman_bool_t pixman_f_transform_point                 (const struct pixman_f_transform *t,
-							struct pixman_f_vector          *v);
-void          pixman_f_transform_point_3d              (const struct pixman_f_transform *t,
-							struct pixman_f_vector          *v);
-void          pixman_f_transform_multiply              (struct pixman_f_transform       *dst,
-							const struct pixman_f_transform *l,
-							const struct pixman_f_transform *r);
-void          pixman_f_transform_init_scale            (struct pixman_f_transform       *t,
-							double                           sx,
-							double                           sy);
-pixman_bool_t pixman_f_transform_scale                 (struct pixman_f_transform       *forward,
-							struct pixman_f_transform       *reverse,
-							double                           sx,
-							double                           sy);
-void          pixman_f_transform_init_rotate           (struct pixman_f_transform       *t,
-							double                           cos,
-							double                           sin);
-pixman_bool_t pixman_f_transform_rotate                (struct pixman_f_transform       *forward,
-							struct pixman_f_transform       *reverse,
-							double                           c,
-							double                           s);
-void          pixman_f_transform_init_translate        (struct pixman_f_transform       *t,
-							double                           tx,
-							double                           ty);
-pixman_bool_t pixman_f_transform_translate             (struct pixman_f_transform       *forward,
-							struct pixman_f_transform       *reverse,
-							double                           tx,
-							double                           ty);
-pixman_bool_t pixman_f_transform_bounds                (const struct pixman_f_transform *t,
-							struct pixman_box16             *b);
-void          pixman_f_transform_init_identity         (struct pixman_f_transform       *t);
-
-typedef enum
-{
-    PIXMAN_REPEAT_NONE,
-    PIXMAN_REPEAT_NORMAL,
-    PIXMAN_REPEAT_PAD,
-    PIXMAN_REPEAT_REFLECT
-} pixman_repeat_t;
-
-typedef enum
-{
-    PIXMAN_FILTER_FAST,
-    PIXMAN_FILTER_GOOD,
-    PIXMAN_FILTER_BEST,
-    PIXMAN_FILTER_NEAREST,
-    PIXMAN_FILTER_BILINEAR,
-    PIXMAN_FILTER_CONVOLUTION,
-
-    /* The SEPARABLE_CONVOLUTION filter takes the following parameters:
-     *
-     *         width:           integer given as 16.16 fixpoint number
-     *         height:          integer given as 16.16 fixpoint number
-     *         x_phase_bits:	integer given as 16.16 fixpoint
-     *         y_phase_bits:	integer given as 16.16 fixpoint
-     *         xtables:         (1 << x_phase_bits) tables of size width
-     *         ytables:         (1 << y_phase_bits) tables of size height
-     *
-     * When sampling at (x, y), the location is first rounded to one of
-     * n_x_phases * n_y_phases subpixel positions. These subpixel positions
-     * determine an xtable and a ytable to use.
-     *
-     * Conceptually a width x height matrix is then formed in which each entry
-     * is the product of the corresponding entries in the x and y tables.
-     * This matrix is then aligned with the image pixels such that its center
-     * is as close as possible to the subpixel location chosen earlier. Then
-     * the image is convolved with the matrix and the resulting pixel returned.
-     */
-    PIXMAN_FILTER_SEPARABLE_CONVOLUTION
-} pixman_filter_t;
-
-typedef enum
-{
-    PIXMAN_OP_CLEAR			= 0x00,
-    PIXMAN_OP_SRC			= 0x01,
-    PIXMAN_OP_DST			= 0x02,
-    PIXMAN_OP_OVER			= 0x03,
-    PIXMAN_OP_OVER_REVERSE		= 0x04,
-    PIXMAN_OP_IN			= 0x05,
-    PIXMAN_OP_IN_REVERSE		= 0x06,
-    PIXMAN_OP_OUT			= 0x07,
-    PIXMAN_OP_OUT_REVERSE		= 0x08,
-    PIXMAN_OP_ATOP			= 0x09,
-    PIXMAN_OP_ATOP_REVERSE		= 0x0a,
-    PIXMAN_OP_XOR			= 0x0b,
-    PIXMAN_OP_ADD			= 0x0c,
-    PIXMAN_OP_SATURATE			= 0x0d,
-
-    PIXMAN_OP_DISJOINT_CLEAR		= 0x10,
-    PIXMAN_OP_DISJOINT_SRC		= 0x11,
-    PIXMAN_OP_DISJOINT_DST		= 0x12,
-    PIXMAN_OP_DISJOINT_OVER		= 0x13,
-    PIXMAN_OP_DISJOINT_OVER_REVERSE	= 0x14,
-    PIXMAN_OP_DISJOINT_IN		= 0x15,
-    PIXMAN_OP_DISJOINT_IN_REVERSE	= 0x16,
-    PIXMAN_OP_DISJOINT_OUT		= 0x17,
-    PIXMAN_OP_DISJOINT_OUT_REVERSE	= 0x18,
-    PIXMAN_OP_DISJOINT_ATOP		= 0x19,
-    PIXMAN_OP_DISJOINT_ATOP_REVERSE	= 0x1a,
-    PIXMAN_OP_DISJOINT_XOR		= 0x1b,
-
-    PIXMAN_OP_CONJOINT_CLEAR		= 0x20,
-    PIXMAN_OP_CONJOINT_SRC		= 0x21,
-    PIXMAN_OP_CONJOINT_DST		= 0x22,
-    PIXMAN_OP_CONJOINT_OVER		= 0x23,
-    PIXMAN_OP_CONJOINT_OVER_REVERSE	= 0x24,
-    PIXMAN_OP_CONJOINT_IN		= 0x25,
-    PIXMAN_OP_CONJOINT_IN_REVERSE	= 0x26,
-    PIXMAN_OP_CONJOINT_OUT		= 0x27,
-    PIXMAN_OP_CONJOINT_OUT_REVERSE	= 0x28,
-    PIXMAN_OP_CONJOINT_ATOP		= 0x29,
-    PIXMAN_OP_CONJOINT_ATOP_REVERSE	= 0x2a,
-    PIXMAN_OP_CONJOINT_XOR		= 0x2b,
-
-    PIXMAN_OP_MULTIPLY                  = 0x30,
-    PIXMAN_OP_SCREEN                    = 0x31,
-    PIXMAN_OP_OVERLAY                   = 0x32,
-    PIXMAN_OP_DARKEN                    = 0x33,
-    PIXMAN_OP_LIGHTEN                   = 0x34,
-    PIXMAN_OP_COLOR_DODGE               = 0x35,
-    PIXMAN_OP_COLOR_BURN                = 0x36,
-    PIXMAN_OP_HARD_LIGHT                = 0x37,
-    PIXMAN_OP_SOFT_LIGHT                = 0x38,
-    PIXMAN_OP_DIFFERENCE                = 0x39,
-    PIXMAN_OP_EXCLUSION                 = 0x3a,
-    PIXMAN_OP_HSL_HUE			= 0x3b,
-    PIXMAN_OP_HSL_SATURATION		= 0x3c,
-    PIXMAN_OP_HSL_COLOR			= 0x3d,
-    PIXMAN_OP_HSL_LUMINOSITY		= 0x3e
-
-#ifdef PIXMAN_USE_INTERNAL_API
-    ,
-    PIXMAN_N_OPERATORS,
-    PIXMAN_OP_NONE = PIXMAN_N_OPERATORS
-#endif
-} pixman_op_t;
-
-/*
- * Regions
- */
-typedef struct pixman_region16_data	pixman_region16_data_t;
-typedef struct pixman_box16		pixman_box16_t;
-typedef struct pixman_rectangle16	pixman_rectangle16_t;
-typedef struct pixman_region16		pixman_region16_t;
-
-struct pixman_region16_data {
-    long		size;
-    long		numRects;
-/*  pixman_box16_t	rects[size];   in memory but not explicitly declared */
-};
-
-struct pixman_rectangle16
-{
-    int16_t	x, y;
-    uint16_t	width, height;
-};
-
-struct pixman_box16
-{
-    int16_t x1, y1, x2, y2;
-};
-
-struct pixman_region16
-{
-    pixman_box16_t          extents;
-    pixman_region16_data_t *data;
-};
-
-typedef enum
-{
-    PIXMAN_REGION_OUT,
-    PIXMAN_REGION_IN,
-    PIXMAN_REGION_PART
-} pixman_region_overlap_t;
-
-/* This function exists only to make it possible to preserve
- * the X ABI - it should go away at first opportunity.
- */
-void pixman_region_set_static_pointers (pixman_box16_t         *empty_box,
-					pixman_region16_data_t *empty_data,
-					pixman_region16_data_t *broken_data);
-
-/* creation/destruction */
-void                    pixman_region_init               (pixman_region16_t *region);
-void                    pixman_region_init_rect          (pixman_region16_t *region,
-							  int                x,
-							  int                y,
-							  unsigned int       width,
-							  unsigned int       height);
-pixman_bool_t           pixman_region_init_rects         (pixman_region16_t *region,
-							  const pixman_box16_t *boxes,
-							  int                count);
-void                    pixman_region_init_with_extents  (pixman_region16_t *region,
-							  pixman_box16_t    *extents);
-void                    pixman_region_init_from_image    (pixman_region16_t *region,
-							  pixman_image_t    *image);
-void                    pixman_region_fini               (pixman_region16_t *region);
-
-
-/* manipulation */
-void                    pixman_region_translate          (pixman_region16_t *region,
-							  int                x,
-							  int                y);
-pixman_bool_t           pixman_region_copy               (pixman_region16_t *dest,
-							  pixman_region16_t *source);
-pixman_bool_t           pixman_region_intersect          (pixman_region16_t *new_reg,
-							  pixman_region16_t *reg1,
-							  pixman_region16_t *reg2);
-pixman_bool_t           pixman_region_union              (pixman_region16_t *new_reg,
-							  pixman_region16_t *reg1,
-							  pixman_region16_t *reg2);
-pixman_bool_t           pixman_region_union_rect         (pixman_region16_t *dest,
-							  pixman_region16_t *source,
-							  int                x,
-							  int                y,
-							  unsigned int       width,
-							  unsigned int       height);
-pixman_bool_t		pixman_region_intersect_rect     (pixman_region16_t *dest,
-							  pixman_region16_t *source,
-							  int                x,
-							  int                y,
-							  unsigned int       width,
-							  unsigned int       height);
-pixman_bool_t           pixman_region_subtract           (pixman_region16_t *reg_d,
-							  pixman_region16_t *reg_m,
-							  pixman_region16_t *reg_s);
-pixman_bool_t           pixman_region_inverse            (pixman_region16_t *new_reg,
-							  pixman_region16_t *reg1,
-							  pixman_box16_t    *inv_rect);
-pixman_bool_t           pixman_region_contains_point     (pixman_region16_t *region,
-							  int                x,
-							  int                y,
-							  pixman_box16_t    *box);
-pixman_region_overlap_t pixman_region_contains_rectangle (pixman_region16_t *region,
-							  pixman_box16_t    *prect);
-pixman_bool_t           pixman_region_not_empty          (pixman_region16_t *region);
-pixman_box16_t *        pixman_region_extents            (pixman_region16_t *region);
-int                     pixman_region_n_rects            (pixman_region16_t *region);
-pixman_box16_t *        pixman_region_rectangles         (pixman_region16_t *region,
-							  int               *n_rects);
-pixman_bool_t           pixman_region_equal              (pixman_region16_t *region1,
-							  pixman_region16_t *region2);
-pixman_bool_t           pixman_region_selfcheck          (pixman_region16_t *region);
-void                    pixman_region_reset              (pixman_region16_t *region,
-							  pixman_box16_t    *box);
-void			pixman_region_clear		 (pixman_region16_t *region);
-/*
- * 32 bit regions
- */
-typedef struct pixman_region32_data	pixman_region32_data_t;
-typedef struct pixman_box32		pixman_box32_t;
-typedef struct pixman_rectangle32	pixman_rectangle32_t;
-typedef struct pixman_region32		pixman_region32_t;
-
-struct pixman_region32_data {
-    long		size;
-    long		numRects;
-/*  pixman_box32_t	rects[size];   in memory but not explicitly declared */
-};
-
-struct pixman_rectangle32
-{
-    int32_t x, y;
-    uint32_t width, height;
-};
-
-struct pixman_box32
-{
-    int32_t x1, y1, x2, y2;
-};
-
-struct pixman_region32
-{
-    pixman_box32_t          extents;
-    pixman_region32_data_t  *data;
-};
-
-/* creation/destruction */
-void                    pixman_region32_init               (pixman_region32_t *region);
-void                    pixman_region32_init_rect          (pixman_region32_t *region,
-							    int                x,
-							    int                y,
-							    unsigned int       width,
-							    unsigned int       height);
-pixman_bool_t           pixman_region32_init_rects         (pixman_region32_t *region,
-							    const pixman_box32_t *boxes,
-							    int                count);
-void                    pixman_region32_init_with_extents  (pixman_region32_t *region,
-							    pixman_box32_t    *extents);
-void                    pixman_region32_init_from_image    (pixman_region32_t *region,
-							    pixman_image_t    *image);
-void                    pixman_region32_fini               (pixman_region32_t *region);
-
-
-/* manipulation */
-void                    pixman_region32_translate          (pixman_region32_t *region,
-							    int                x,
-							    int                y);
-pixman_bool_t           pixman_region32_copy               (pixman_region32_t *dest,
-							    pixman_region32_t *source);
-pixman_bool_t           pixman_region32_intersect          (pixman_region32_t *new_reg,
-							    pixman_region32_t *reg1,
-							    pixman_region32_t *reg2);
-pixman_bool_t           pixman_region32_union              (pixman_region32_t *new_reg,
-							    pixman_region32_t *reg1,
-							    pixman_region32_t *reg2);
-pixman_bool_t		pixman_region32_intersect_rect     (pixman_region32_t *dest,
-							    pixman_region32_t *source,
-							    int                x,
-							    int                y,
-							    unsigned int       width,
-							    unsigned int       height);
-pixman_bool_t           pixman_region32_union_rect         (pixman_region32_t *dest,
-							    pixman_region32_t *source,
-							    int                x,
-							    int                y,
-							    unsigned int       width,
-							    unsigned int       height);
-pixman_bool_t           pixman_region32_subtract           (pixman_region32_t *reg_d,
-							    pixman_region32_t *reg_m,
-							    pixman_region32_t *reg_s);
-pixman_bool_t           pixman_region32_inverse            (pixman_region32_t *new_reg,
-							    pixman_region32_t *reg1,
-							    pixman_box32_t    *inv_rect);
-pixman_bool_t           pixman_region32_contains_point     (pixman_region32_t *region,
-							    int                x,
-							    int                y,
-							    pixman_box32_t    *box);
-pixman_region_overlap_t pixman_region32_contains_rectangle (pixman_region32_t *region,
-							    pixman_box32_t    *prect);
-pixman_bool_t           pixman_region32_not_empty          (pixman_region32_t *region);
-pixman_box32_t *        pixman_region32_extents            (pixman_region32_t *region);
-int                     pixman_region32_n_rects            (pixman_region32_t *region);
-pixman_box32_t *        pixman_region32_rectangles         (pixman_region32_t *region,
-							    int               *n_rects);
-pixman_bool_t           pixman_region32_equal              (pixman_region32_t *region1,
-							    pixman_region32_t *region2);
-pixman_bool_t           pixman_region32_selfcheck          (pixman_region32_t *region);
-void                    pixman_region32_reset              (pixman_region32_t *region,
-							    pixman_box32_t    *box);
-void			pixman_region32_clear		   (pixman_region32_t *region);
-
-
-/* Copy / Fill / Misc */
-pixman_bool_t pixman_blt                (uint32_t           *src_bits,
-					 uint32_t           *dst_bits,
-					 int                 src_stride,
-					 int                 dst_stride,
-					 int                 src_bpp,
-					 int                 dst_bpp,
-					 int                 src_x,
-					 int                 src_y,
-					 int                 dest_x,
-					 int                 dest_y,
-					 int                 width,
-					 int                 height);
-pixman_bool_t pixman_fill               (uint32_t           *bits,
-					 int                 stride,
-					 int                 bpp,
-					 int                 x,
-					 int                 y,
-					 int                 width,
-					 int                 height,
-					 uint32_t            _xor);
-
-int           pixman_version            (void);
-const char*   pixman_version_string     (void);
-
-/*
- * Images
- */
-typedef struct pixman_indexed		pixman_indexed_t;
-typedef struct pixman_gradient_stop	pixman_gradient_stop_t;
-
-typedef uint32_t (* pixman_read_memory_func_t) (const void *src, int size);
-typedef void     (* pixman_write_memory_func_t) (void *dst, uint32_t value, int size);
-
-typedef void     (* pixman_image_destroy_func_t) (pixman_image_t *image, void *data);
-
-struct pixman_gradient_stop {
-    pixman_fixed_t x;
-    pixman_color_t color;
-};
-
-#define PIXMAN_MAX_INDEXED  256 /* XXX depth must be <= 8 */
-
-#if PIXMAN_MAX_INDEXED <= 256
-typedef uint8_t pixman_index_type;
-#endif
-
-struct pixman_indexed
-{
-    pixman_bool_t       color;
-    uint32_t		rgba[PIXMAN_MAX_INDEXED];
-    pixman_index_type	ent[32768];
-};
-
-/*
- * While the protocol is generous in format support, the
- * sample implementation allows only packed RGB and GBR
- * representations for data to simplify software rendering,
- */
-#define PIXMAN_FORMAT(bpp,type,a,r,g,b)	(((bpp) << 24) |  \
-					 ((type) << 16) | \
-					 ((a) << 12) |	  \
-					 ((r) << 8) |	  \
-					 ((g) << 4) |	  \
-					 ((b)))
-
-#define PIXMAN_FORMAT_BPP(f)	(((f) >> 24)       )
-#define PIXMAN_FORMAT_TYPE(f)	(((f) >> 16) & 0xff)
-#define PIXMAN_FORMAT_A(f)	(((f) >> 12) & 0x0f)
-#define PIXMAN_FORMAT_R(f)	(((f) >>  8) & 0x0f)
-#define PIXMAN_FORMAT_G(f)	(((f) >>  4) & 0x0f)
-#define PIXMAN_FORMAT_B(f)	(((f)      ) & 0x0f)
-#define PIXMAN_FORMAT_RGB(f)	(((f)      ) & 0xfff)
-#define PIXMAN_FORMAT_VIS(f)	(((f)      ) & 0xffff)
-#define PIXMAN_FORMAT_DEPTH(f)	(PIXMAN_FORMAT_A(f) +	\
-				 PIXMAN_FORMAT_R(f) +	\
-				 PIXMAN_FORMAT_G(f) +	\
-				 PIXMAN_FORMAT_B(f))
-
-#define PIXMAN_TYPE_OTHER	0
-#define PIXMAN_TYPE_A		1
-#define PIXMAN_TYPE_ARGB	2
-#define PIXMAN_TYPE_ABGR	3
-#define PIXMAN_TYPE_COLOR	4
-#define PIXMAN_TYPE_GRAY	5
-#define PIXMAN_TYPE_YUY2	6
-#define PIXMAN_TYPE_YV12	7
-#define PIXMAN_TYPE_BGRA	8
-#define PIXMAN_TYPE_RGBA	9
-#define PIXMAN_TYPE_ARGB_SRGB	10
-
-#define PIXMAN_FORMAT_COLOR(f)				\
-	(PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_ARGB ||	\
-	 PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_ABGR ||	\
-	 PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_BGRA ||	\
-	 PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_RGBA)
-
-/* 32bpp formats */
-typedef enum {
-    PIXMAN_a8r8g8b8 =	 PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,8,8,8,8),
-    PIXMAN_x8r8g8b8 =	 PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,0,8,8,8),
-    PIXMAN_a8b8g8r8 =	 PIXMAN_FORMAT(32,PIXMAN_TYPE_ABGR,8,8,8,8),
-    PIXMAN_x8b8g8r8 =	 PIXMAN_FORMAT(32,PIXMAN_TYPE_ABGR,0,8,8,8),
-    PIXMAN_b8g8r8a8 =	 PIXMAN_FORMAT(32,PIXMAN_TYPE_BGRA,8,8,8,8),
-    PIXMAN_b8g8r8x8 =	 PIXMAN_FORMAT(32,PIXMAN_TYPE_BGRA,0,8,8,8),
-    PIXMAN_r8g8b8a8 =	 PIXMAN_FORMAT(32,PIXMAN_TYPE_RGBA,8,8,8,8),
-    PIXMAN_r8g8b8x8 =	 PIXMAN_FORMAT(32,PIXMAN_TYPE_RGBA,0,8,8,8),
-    PIXMAN_x14r6g6b6 =	 PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,0,6,6,6),
-    PIXMAN_x2r10g10b10 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,0,10,10,10),
-    PIXMAN_a2r10g10b10 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,2,10,10,10),
-    PIXMAN_x2b10g10r10 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ABGR,0,10,10,10),
-    PIXMAN_a2b10g10r10 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ABGR,2,10,10,10),
-
-/* sRGB formats */
-    PIXMAN_a8r8g8b8_sRGB = PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB_SRGB,8,8,8,8),
-
-/* 24bpp formats */
-    PIXMAN_r8g8b8 =	 PIXMAN_FORMAT(24,PIXMAN_TYPE_ARGB,0,8,8,8),
-    PIXMAN_b8g8r8 =	 PIXMAN_FORMAT(24,PIXMAN_TYPE_ABGR,0,8,8,8),
-
-/* 16bpp formats */
-    PIXMAN_r5g6b5 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,0,5,6,5),
-    PIXMAN_b5g6r5 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_ABGR,0,5,6,5),
-
-    PIXMAN_a1r5g5b5 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,1,5,5,5),
-    PIXMAN_x1r5g5b5 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,0,5,5,5),
-    PIXMAN_a1b5g5r5 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_ABGR,1,5,5,5),
-    PIXMAN_x1b5g5r5 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_ABGR,0,5,5,5),
-    PIXMAN_a4r4g4b4 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,4,4,4,4),
-    PIXMAN_x4r4g4b4 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,0,4,4,4),
-    PIXMAN_a4b4g4r4 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_ABGR,4,4,4,4),
-    PIXMAN_x4b4g4r4 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_ABGR,0,4,4,4),
-
-/* 8bpp formats */
-    PIXMAN_a8 =		 PIXMAN_FORMAT(8,PIXMAN_TYPE_A,8,0,0,0),
-    PIXMAN_r3g3b2 =	 PIXMAN_FORMAT(8,PIXMAN_TYPE_ARGB,0,3,3,2),
-    PIXMAN_b2g3r3 =	 PIXMAN_FORMAT(8,PIXMAN_TYPE_ABGR,0,3,3,2),
-    PIXMAN_a2r2g2b2 =	 PIXMAN_FORMAT(8,PIXMAN_TYPE_ARGB,2,2,2,2),
-    PIXMAN_a2b2g2r2 =	 PIXMAN_FORMAT(8,PIXMAN_TYPE_ABGR,2,2,2,2),
-
-    PIXMAN_c8 =		 PIXMAN_FORMAT(8,PIXMAN_TYPE_COLOR,0,0,0,0),
-    PIXMAN_g8 =		 PIXMAN_FORMAT(8,PIXMAN_TYPE_GRAY,0,0,0,0),
-
-    PIXMAN_x4a4 =	 PIXMAN_FORMAT(8,PIXMAN_TYPE_A,4,0,0,0),
-
-    PIXMAN_x4c4 =	 PIXMAN_FORMAT(8,PIXMAN_TYPE_COLOR,0,0,0,0),
-    PIXMAN_x4g4 =	 PIXMAN_FORMAT(8,PIXMAN_TYPE_GRAY,0,0,0,0),
-
-/* 4bpp formats */
-    PIXMAN_a4 =		 PIXMAN_FORMAT(4,PIXMAN_TYPE_A,4,0,0,0),
-    PIXMAN_r1g2b1 =	 PIXMAN_FORMAT(4,PIXMAN_TYPE_ARGB,0,1,2,1),
-    PIXMAN_b1g2r1 =	 PIXMAN_FORMAT(4,PIXMAN_TYPE_ABGR,0,1,2,1),
-    PIXMAN_a1r1g1b1 =	 PIXMAN_FORMAT(4,PIXMAN_TYPE_ARGB,1,1,1,1),
-    PIXMAN_a1b1g1r1 =	 PIXMAN_FORMAT(4,PIXMAN_TYPE_ABGR,1,1,1,1),
-
-    PIXMAN_c4 =		 PIXMAN_FORMAT(4,PIXMAN_TYPE_COLOR,0,0,0,0),
-    PIXMAN_g4 =		 PIXMAN_FORMAT(4,PIXMAN_TYPE_GRAY,0,0,0,0),
-
-/* 1bpp formats */
-    PIXMAN_a1 =		 PIXMAN_FORMAT(1,PIXMAN_TYPE_A,1,0,0,0),
-
-    PIXMAN_g1 =		 PIXMAN_FORMAT(1,PIXMAN_TYPE_GRAY,0,0,0,0),
-
-/* YUV formats */
-    PIXMAN_yuy2 =	 PIXMAN_FORMAT(16,PIXMAN_TYPE_YUY2,0,0,0,0),
-    PIXMAN_yv12 =	 PIXMAN_FORMAT(12,PIXMAN_TYPE_YV12,0,0,0,0)
-} pixman_format_code_t;
-
-/* Querying supported format values. */
-pixman_bool_t pixman_format_supported_destination (pixman_format_code_t format);
-pixman_bool_t pixman_format_supported_source      (pixman_format_code_t format);
-
-/* Constructors */
-pixman_image_t *pixman_image_create_solid_fill       (const pixman_color_t         *color);
-pixman_image_t *pixman_image_create_linear_gradient  (const pixman_point_fixed_t   *p1,
-						      const pixman_point_fixed_t   *p2,
-						      const pixman_gradient_stop_t *stops,
-						      int                           n_stops);
-pixman_image_t *pixman_image_create_radial_gradient  (const pixman_point_fixed_t   *inner,
-						      const pixman_point_fixed_t   *outer,
-						      pixman_fixed_t                inner_radius,
-						      pixman_fixed_t                outer_radius,
-						      const pixman_gradient_stop_t *stops,
-						      int                           n_stops);
-pixman_image_t *pixman_image_create_conical_gradient (const pixman_point_fixed_t   *center,
-						      pixman_fixed_t                angle,
-						      const pixman_gradient_stop_t *stops,
-						      int                           n_stops);
-pixman_image_t *pixman_image_create_bits             (pixman_format_code_t          format,
-						      int                           width,
-						      int                           height,
-						      uint32_t                     *bits,
-						      int                           rowstride_bytes);
-pixman_image_t *pixman_image_create_bits_no_clear    (pixman_format_code_t format,
-						      int                  width,
-						      int                  height,
-						      uint32_t *           bits,
-						      int                  rowstride_bytes);
-
-/* Destructor */
-pixman_image_t *pixman_image_ref                     (pixman_image_t               *image);
-pixman_bool_t   pixman_image_unref                   (pixman_image_t               *image);
-
-void		pixman_image_set_destroy_function    (pixman_image_t		   *image,
-						      pixman_image_destroy_func_t   function,
-						      void			   *data);
-void *		pixman_image_get_destroy_data        (pixman_image_t		   *image);
-
-/* Set properties */
-pixman_bool_t   pixman_image_set_clip_region         (pixman_image_t               *image,
-						      pixman_region16_t            *region);
-pixman_bool_t   pixman_image_set_clip_region32       (pixman_image_t               *image,
-						      pixman_region32_t            *region);
-void		pixman_image_set_has_client_clip     (pixman_image_t               *image,
-						      pixman_bool_t		    clien_clip);
-pixman_bool_t   pixman_image_set_transform           (pixman_image_t               *image,
-						      const pixman_transform_t     *transform);
-void            pixman_image_set_repeat              (pixman_image_t               *image,
-						      pixman_repeat_t               repeat);
-pixman_bool_t   pixman_image_set_filter              (pixman_image_t               *image,
-						      pixman_filter_t               filter,
-						      const pixman_fixed_t         *filter_params,
-						      int                           n_filter_params);
-void		pixman_image_set_source_clipping     (pixman_image_t		   *image,
-						      pixman_bool_t                 source_clipping);
-void            pixman_image_set_alpha_map           (pixman_image_t               *image,
-						      pixman_image_t               *alpha_map,
-						      int16_t                       x,
-						      int16_t                       y);
-void            pixman_image_set_component_alpha     (pixman_image_t               *image,
-						      pixman_bool_t                 component_alpha);
-pixman_bool_t   pixman_image_get_component_alpha     (pixman_image_t               *image);
-void		pixman_image_set_accessors	     (pixman_image_t		   *image,
-						      pixman_read_memory_func_t	    read_func,
-						      pixman_write_memory_func_t    write_func);
-void		pixman_image_set_indexed	     (pixman_image_t		   *image,
-						      const pixman_indexed_t	   *indexed);
-uint32_t       *pixman_image_get_data                (pixman_image_t               *image);
-int		pixman_image_get_width               (pixman_image_t               *image);
-int             pixman_image_get_height              (pixman_image_t               *image);
-int		pixman_image_get_stride              (pixman_image_t               *image); /* in bytes */
-int		pixman_image_get_depth               (pixman_image_t		   *image);
-pixman_format_code_t pixman_image_get_format	     (pixman_image_t		   *image);
-
-typedef enum
-{
-    PIXMAN_KERNEL_IMPULSE,
-    PIXMAN_KERNEL_BOX,
-    PIXMAN_KERNEL_LINEAR,
-    PIXMAN_KERNEL_CUBIC,
-    PIXMAN_KERNEL_GAUSSIAN,
-    PIXMAN_KERNEL_LANCZOS2,
-    PIXMAN_KERNEL_LANCZOS3,
-    PIXMAN_KERNEL_LANCZOS3_STRETCHED       /* Jim Blinn's 'nice' filter */
-} pixman_kernel_t;
-
-/* Create the parameter list for a SEPARABLE_CONVOLUTION filter
- * with the given kernels and scale parameters.
- */
-pixman_fixed_t *
-pixman_filter_create_separable_convolution (int             *n_values,
-					    pixman_fixed_t   scale_x,
-					    pixman_fixed_t   scale_y,
-					    pixman_kernel_t  reconstruct_x,
-					    pixman_kernel_t  reconstruct_y,
-					    pixman_kernel_t  sample_x,
-					    pixman_kernel_t  sample_y,
-					    int              subsample_bits_x,
-					    int              subsample_bits_y);
-
-pixman_bool_t	pixman_image_fill_rectangles	     (pixman_op_t		    op,
-						      pixman_image_t		   *image,
-						      const pixman_color_t	   *color,
-						      int			    n_rects,
-						      const pixman_rectangle16_t   *rects);
-pixman_bool_t   pixman_image_fill_boxes              (pixman_op_t                   op,
-                                                      pixman_image_t               *dest,
-                                                      const pixman_color_t         *color,
-                                                      int                           n_boxes,
-                                                      const pixman_box32_t         *boxes);
-
-/* Composite */
-pixman_bool_t pixman_compute_composite_region (pixman_region16_t *region,
-					       pixman_image_t    *src_image,
-					       pixman_image_t    *mask_image,
-					       pixman_image_t    *dest_image,
-					       int16_t            src_x,
-					       int16_t            src_y,
-					       int16_t            mask_x,
-					       int16_t            mask_y,
-					       int16_t            dest_x,
-					       int16_t            dest_y,
-					       uint16_t           width,
-					       uint16_t           height);
-void          pixman_image_composite          (pixman_op_t        op,
-					       pixman_image_t    *src,
-					       pixman_image_t    *mask,
-					       pixman_image_t    *dest,
-					       int16_t            src_x,
-					       int16_t            src_y,
-					       int16_t            mask_x,
-					       int16_t            mask_y,
-					       int16_t            dest_x,
-					       int16_t            dest_y,
-					       uint16_t           width,
-					       uint16_t           height);
-void          pixman_image_composite32        (pixman_op_t        op,
-					       pixman_image_t    *src,
-					       pixman_image_t    *mask,
-					       pixman_image_t    *dest,
-					       int32_t            src_x,
-					       int32_t            src_y,
-					       int32_t            mask_x,
-					       int32_t            mask_y,
-					       int32_t            dest_x,
-					       int32_t            dest_y,
-					       int32_t            width,
-					       int32_t            height);
-
-/* Executive Summary: This function is a no-op that only exists
- * for historical reasons.
- *
- * There used to be a bug in the X server where it would rely on
- * out-of-bounds accesses when it was asked to composite with a
- * window as the source. It would create a pixman image pointing
- * to some bogus position in memory, but then set a clip region
- * to the position where the actual bits were.
- *
- * Due to a bug in old versions of pixman, where it would not clip
- * against the image bounds when a clip region was set, this would
- * actually work. So when the pixman bug was fixed, a workaround was
- * added to allow certain out-of-bound accesses. This function disabled
- * those workarounds.
- *
- * Since 0.21.2, pixman doesn't do these workarounds anymore, so now this
- * function is a no-op.
- */
-void pixman_disable_out_of_bounds_workaround (void);
-
-/*
- * Glyphs
- */
-typedef struct pixman_glyph_cache_t pixman_glyph_cache_t;
-typedef struct
-{
-    int		x, y;
-    const void *glyph;
-} pixman_glyph_t;
-
-pixman_glyph_cache_t *pixman_glyph_cache_create       (void);
-void                  pixman_glyph_cache_destroy      (pixman_glyph_cache_t *cache);
-void                  pixman_glyph_cache_freeze       (pixman_glyph_cache_t *cache);
-void                  pixman_glyph_cache_thaw         (pixman_glyph_cache_t *cache);
-const void *          pixman_glyph_cache_lookup       (pixman_glyph_cache_t *cache,
-						       void                 *font_key,
-						       void                 *glyph_key);
-const void *          pixman_glyph_cache_insert       (pixman_glyph_cache_t *cache,
-						       void                 *font_key,
-						       void                 *glyph_key,
-						       int		     origin_x,
-						       int                   origin_y,
-						       pixman_image_t       *glyph_image);
-void                  pixman_glyph_cache_remove       (pixman_glyph_cache_t *cache,
-						       void                 *font_key,
-						       void                 *glyph_key);
-void                  pixman_glyph_get_extents        (pixman_glyph_cache_t *cache,
-						       int                   n_glyphs,
-						       pixman_glyph_t       *glyphs,
-						       pixman_box32_t       *extents);
-pixman_format_code_t  pixman_glyph_get_mask_format    (pixman_glyph_cache_t *cache,
-						       int		     n_glyphs,
-						       const pixman_glyph_t *glyphs);
-void                  pixman_composite_glyphs         (pixman_op_t           op,
-						       pixman_image_t       *src,
-						       pixman_image_t       *dest,
-						       pixman_format_code_t  mask_format,
-						       int32_t               src_x,
-						       int32_t               src_y,
-						       int32_t		     mask_x,
-						       int32_t		     mask_y,
-						       int32_t               dest_x,
-						       int32_t               dest_y,
-						       int32_t		     width,
-						       int32_t		     height,
-						       pixman_glyph_cache_t *cache,
-						       int		     n_glyphs,
-						       const pixman_glyph_t *glyphs);
-void                  pixman_composite_glyphs_no_mask (pixman_op_t           op,
-						       pixman_image_t       *src,
-						       pixman_image_t       *dest,
-						       int32_t               src_x,
-						       int32_t               src_y,
-						       int32_t               dest_x,
-						       int32_t               dest_y,
-						       pixman_glyph_cache_t *cache,
-						       int		     n_glyphs,
-						       const pixman_glyph_t *glyphs);
-
-/*
- * Trapezoids
- */
-typedef struct pixman_edge pixman_edge_t;
-typedef struct pixman_trapezoid pixman_trapezoid_t;
-typedef struct pixman_trap pixman_trap_t;
-typedef struct pixman_span_fix pixman_span_fix_t;
-typedef struct pixman_triangle pixman_triangle_t;
-
-/*
- * An edge structure.  This represents a single polygon edge
- * and can be quickly stepped across small or large gaps in the
- * sample grid
- */
-struct pixman_edge
-{
-    pixman_fixed_t	x;
-    pixman_fixed_t	e;
-    pixman_fixed_t	stepx;
-    pixman_fixed_t	signdx;
-    pixman_fixed_t	dy;
-    pixman_fixed_t	dx;
-
-    pixman_fixed_t	stepx_small;
-    pixman_fixed_t	stepx_big;
-    pixman_fixed_t	dx_small;
-    pixman_fixed_t	dx_big;
-};
-
-struct pixman_trapezoid
-{
-    pixman_fixed_t	top, bottom;
-    pixman_line_fixed_t	left, right;
-};
-
-struct pixman_triangle
-{
-    pixman_point_fixed_t p1, p2, p3;
-};
-
-/* whether 't' is a well defined not obviously empty trapezoid */
-#define pixman_trapezoid_valid(t)				   \
-    ((t)->left.p1.y != (t)->left.p2.y &&			   \
-     (t)->right.p1.y != (t)->right.p2.y &&			   \
-     ((t)->bottom > (t)->top))
-
-struct pixman_span_fix
-{
-    pixman_fixed_t	l, r, y;
-};
-
-struct pixman_trap
-{
-    pixman_span_fix_t	top, bot;
-};
-
-pixman_fixed_t pixman_sample_ceil_y        (pixman_fixed_t             y,
-					    int                        bpp);
-pixman_fixed_t pixman_sample_floor_y       (pixman_fixed_t             y,
-					    int                        bpp);
-void           pixman_edge_step            (pixman_edge_t             *e,
-					    int                        n);
-void           pixman_edge_init            (pixman_edge_t             *e,
-					    int                        bpp,
-					    pixman_fixed_t             y_start,
-					    pixman_fixed_t             x_top,
-					    pixman_fixed_t             y_top,
-					    pixman_fixed_t             x_bot,
-					    pixman_fixed_t             y_bot);
-void           pixman_line_fixed_edge_init (pixman_edge_t             *e,
-					    int                        bpp,
-					    pixman_fixed_t             y,
-					    const pixman_line_fixed_t *line,
-					    int                        x_off,
-					    int                        y_off);
-void           pixman_rasterize_edges      (pixman_image_t            *image,
-					    pixman_edge_t             *l,
-					    pixman_edge_t             *r,
-					    pixman_fixed_t             t,
-					    pixman_fixed_t             b);
-void           pixman_add_traps            (pixman_image_t            *image,
-					    int16_t                    x_off,
-					    int16_t                    y_off,
-					    int                        ntrap,
-					    const pixman_trap_t       *traps);
-void           pixman_add_trapezoids       (pixman_image_t            *image,
-					    int16_t                    x_off,
-					    int                        y_off,
-					    int                        ntraps,
-					    const pixman_trapezoid_t  *traps);
-void           pixman_rasterize_trapezoid  (pixman_image_t            *image,
-					    const pixman_trapezoid_t  *trap,
-					    int                        x_off,
-					    int                        y_off);
-void          pixman_composite_trapezoids (pixman_op_t		       op,
-					   pixman_image_t *	       src,
-					   pixman_image_t *	       dst,
-					   pixman_format_code_t	       mask_format,
-					   int			       x_src,
-					   int			       y_src,
-					   int			       x_dst,
-					   int			       y_dst,
-					   int			       n_traps,
-					   const pixman_trapezoid_t *  traps);
-void          pixman_composite_triangles (pixman_op_t		       op,
-					  pixman_image_t *	       src,
-					  pixman_image_t *	       dst,
-					  pixman_format_code_t	       mask_format,
-					  int			       x_src,
-					  int			       y_src,
-					  int			       x_dst,
-					  int			       y_dst,
-					  int			       n_tris,
-					  const pixman_triangle_t *    tris);
-void	      pixman_add_triangles       (pixman_image_t              *image,
-					  int32_t	               x_off,
-					  int32_t	               y_off,
-					  int	                       n_tris,
-					  const pixman_triangle_t     *tris);
-
-PIXMAN_END_DECLS
-
-#endif /* PIXMAN_H__ */
diff --git a/linux-x86/include/png.h b/linux-x86/include/png.h
deleted file mode 120000
index bbca0e8..0000000
--- a/linux-x86/include/png.h
+++ /dev/null
@@ -1 +0,0 @@
-libpng16/png.h
\ No newline at end of file
diff --git a/linux-x86/include/pngconf.h b/linux-x86/include/pngconf.h
deleted file mode 120000
index addd8a1..0000000
--- a/linux-x86/include/pngconf.h
+++ /dev/null
@@ -1 +0,0 @@
-libpng16/pngconf.h
\ No newline at end of file
diff --git a/linux-x86/include/pnglibconf.h b/linux-x86/include/pnglibconf.h
deleted file mode 120000
index 64d182a..0000000
--- a/linux-x86/include/pnglibconf.h
+++ /dev/null
@@ -1 +0,0 @@
-libpng16/pnglibconf.h
\ No newline at end of file
diff --git a/linux-x86/include/zconf.h b/linux-x86/include/zconf.h
deleted file mode 100644
index 996fff2..0000000
--- a/linux-x86/include/zconf.h
+++ /dev/null
@@ -1,511 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#if 1    /* was set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#if 1    /* was set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/linux-x86/include/zlib.h b/linux-x86/include/zlib.h
deleted file mode 100644
index 3e0c767..0000000
--- a/linux-x86/include/zlib.h
+++ /dev/null
@@ -1,1768 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
-
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
-#define ZLIB_VER_SUBREVISION 0
-
-/*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
-
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-    The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-    The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-    This library can optionally read and write gzip streams in memory as well.
-
-    The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    z_const Bytef *next_in;     /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total number of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total number of bytes output so far */
-
-    z_const char *msg;  /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
-
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
-   opaque value.
-
-     zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-     On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this if
-   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
-   returned by zalloc for objects of exactly 65536 bytes *must* have their
-   offset normalized to zero.  The default allocation function provided by this
-   library ensures this (see zutil.c).  To reduce memory requirements and avoid
-   any allocation of 64K objects, at the expense of compression ratio, compile
-   the library with -DMAX_WBITS=14 (see zconf.h).
-
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-#define Z_TREES         6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-   allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows.  deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
-
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
-  not return Z_STREAM_END, and it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression.  The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows.  inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
-
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
-  operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to
-  inform inflate that a faster approach can be used for the single inflate()
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
-  on the return value of inflate() as noted below, when inflate() returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-  memory for a sliding window when Z_FINISH is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
-
-     The method parameter is the compression method.  It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm.  Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
-
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
-   function must be called immediately after deflateInit, deflateInit2 or
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
-   function must be called either before any call of deflate, or immediately
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
-
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are Z_NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
-
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-     If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter.  The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
-   time to set the dictionary.  If the provided dictionary is smaller than the
-   window and there is already data in the window, then the provided dictionary
-   will amend what's there.  The application must insure that the dictionary
-   that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
-/*
-     Returns the sliding dictionary being maintained by inflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If inflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-     Skips invalid compressed data until a possible full flush point (see above
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurrences of this
-   pattern are full flush points.
-
-     inflateSync returns Z_OK if a possible full flush point has been found,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
-
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
-   the windowBits parameter is invalid.
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
-
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above or -1 << 16 if the provided
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
-
-     The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not Z_NULL and the respective field is not
-   present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-     If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is potentially more efficient than
-   inflate() for file i/o applications, in that it avoids copying between the
-   output and the sliding window by simply making the window itself the output
-   buffer.  inflate() can be faster on modern CPUs when used with large
-   buffers.  inflateBack() trusts the application to not change the output
-   buffer passed by the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be Z_NULL only if in() returned an error.  If
-   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
-   cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-#ifndef Z_SOLO
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer.  The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
-*/
-
-                        /* gzip file access functions */
-
-/*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
-
-/*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
-   request transparent writing or appending with no compression and not using
-   the gzip format.
-
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
-
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
-
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
-/*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
-/*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
-
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file is not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
-   concatenated in the input file, and will all be decompressed by gzread().
-   If something other than a gzip stream is encountered after a gzip stream,
-   that remaining trailing garbage is ignored (and no error is returned).
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
-*/
-
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
-*/
-
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-     Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
-*/
-
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
-/*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
-   returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
-/*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
-*/
-
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
-/*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
-
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-     gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
-
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-   last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-#endif /* !Z_SOLO */
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster.
-
-   Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-/*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-/*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
-
-#ifndef Z_SOLO
-
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
-struct gzFile_s {
-    unsigned have;
-    unsigned char *next;
-    z_off64_t pos;
-};
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#else
-#  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#endif
-
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-#endif
-
-#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-#  ifdef Z_PREFIX_SET
-#    define z_gzopen z_gzopen64
-#    define z_gzseek z_gzseek64
-#    define z_gztell z_gztell64
-#    define z_gzoffset z_gzoffset64
-#    define z_adler32_combine z_adler32_combine64
-#    define z_crc32_combine z_crc32_combine64
-#  else
-#    define gzopen gzopen64
-#    define gzseek gzseek64
-#    define gztell gztell64
-#    define gzoffset gzoffset64
-#    define adler32_combine adler32_combine64
-#    define crc32_combine crc32_combine64
-#  endif
-#  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#  endif
-#else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
-
-#else /* Z_SOLO */
-
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-
-#endif /* !Z_SOLO */
-
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
-/* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
-#  endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/linux-x86/lib/glib-2.0/include/glibconfig.h b/linux-x86/lib/glib-2.0/include/glibconfig.h
deleted file mode 100644
index 1abec6c..0000000
--- a/linux-x86/lib/glib-2.0/include/glibconfig.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/* glibconfig.h
- *
- * This is a generated file.  Please modify 'configure.ac'
- */
-
-#ifndef __GLIBCONFIG_H__
-#define __GLIBCONFIG_H__
-
-#include <glib/gmacros.h>
-
-#include <limits.h>
-#include <float.h>
-#define GLIB_HAVE_ALLOCA_H
-#define GLIB_HAVE_SYS_POLL_H
-
-/* Specifies that GLib's g_print*() functions wrap the
- * system printf functions.  This is useful to know, for example,
- * when using glibc's register_printf_function().
- */
-#define GLIB_USING_SYSTEM_PRINTF
-
-G_BEGIN_DECLS
-
-#define G_MINFLOAT	FLT_MIN
-#define G_MAXFLOAT	FLT_MAX
-#define G_MINDOUBLE	DBL_MIN
-#define G_MAXDOUBLE	DBL_MAX
-#define G_MINSHORT	SHRT_MIN
-#define G_MAXSHORT	SHRT_MAX
-#define G_MAXUSHORT	USHRT_MAX
-#define G_MININT	INT_MIN
-#define G_MAXINT	INT_MAX
-#define G_MAXUINT	UINT_MAX
-#define G_MINLONG	LONG_MIN
-#define G_MAXLONG	LONG_MAX
-#define G_MAXULONG	ULONG_MAX
-
-typedef signed char gint8;
-typedef unsigned char guint8;
-typedef signed short gint16;
-typedef unsigned short guint16;
-#define G_GINT16_MODIFIER "h"
-#define G_GINT16_FORMAT "hi"
-#define G_GUINT16_FORMAT "hu"
-typedef signed int gint32;
-typedef unsigned int guint32;
-#define G_GINT32_MODIFIER ""
-#define G_GINT32_FORMAT "i"
-#define G_GUINT32_FORMAT "u"
-#define G_HAVE_GINT64 1          /* deprecated, always true */
-
-G_GNUC_EXTENSION typedef signed long long gint64;
-G_GNUC_EXTENSION typedef unsigned long long guint64;
-
-#define G_GINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##LL))
-#define G_GUINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##ULL))
-#define G_GINT64_MODIFIER "ll"
-#define G_GINT64_FORMAT "lli"
-#define G_GUINT64_FORMAT "llu"
-
-#define GLIB_SIZEOF_VOID_P 4
-#define GLIB_SIZEOF_LONG   4
-#define GLIB_SIZEOF_SIZE_T 4
-#define GLIB_SIZEOF_SSIZE_T 4
-
-typedef signed int gssize;
-typedef unsigned int gsize;
-#define G_GSIZE_MODIFIER ""
-#define G_GSSIZE_MODIFIER ""
-#define G_GSIZE_FORMAT "u"
-#define G_GSSIZE_FORMAT "i"
-
-#define G_MAXSIZE	G_MAXUINT
-#define G_MINSSIZE	G_MININT
-#define G_MAXSSIZE	G_MAXINT
-
-typedef gint64 goffset;
-#define G_MINOFFSET	G_MININT64
-#define G_MAXOFFSET	G_MAXINT64
-
-#define G_GOFFSET_MODIFIER      G_GINT64_MODIFIER
-#define G_GOFFSET_FORMAT        G_GINT64_FORMAT
-#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
-
-
-#define GPOINTER_TO_INT(p)	((gint)  (gint) (p))
-#define GPOINTER_TO_UINT(p)	((guint) (guint) (p))
-
-#define GINT_TO_POINTER(i)	((gpointer) (gint) (i))
-#define GUINT_TO_POINTER(u)	((gpointer) (guint) (u))
-
-typedef signed int gintptr;
-typedef unsigned int guintptr;
-
-#define G_GINTPTR_MODIFIER      ""
-#define G_GINTPTR_FORMAT        "i"
-#define G_GUINTPTR_FORMAT       "u"
-
-#ifdef NeXT /* @#%@! NeXTStep */
-# define g_ATEXIT(proc)	(!atexit (proc))
-#else
-# define g_ATEXIT(proc)	(atexit (proc))
-#endif
-
-#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
-
-#define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 38
-#define GLIB_MICRO_VERSION 2
-
-#define G_OS_UNIX
-
-
-#define G_VA_COPY	va_copy
-
-#ifdef	__cplusplus
-#define	G_HAVE_INLINE	1
-#else	/* !__cplusplus */
-#define G_HAVE_INLINE 1
-#define G_HAVE___INLINE 1
-#define G_HAVE___INLINE__ 1
-#endif	/* !__cplusplus */
-
-#ifdef	__cplusplus
-#define G_CAN_INLINE	1
-#else	/* !__cplusplus */
-#define G_CAN_INLINE	1
-#endif
-
-#ifndef __cplusplus
-# define G_HAVE_ISO_VARARGS 1
-#endif
-#ifdef __cplusplus
-# define G_HAVE_ISO_VARARGS 1
-#endif
-
-/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
- * is passed ISO vararg support is turned off, and there is no work
- * around to turn it on, so we unconditionally turn it off.
- */
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
-#  undef G_HAVE_ISO_VARARGS
-#endif
-
-#define G_HAVE_GNUC_VARARGS 1
-#define G_HAVE_GROWING_STACK 1
-
-#define G_HAVE_GNUC_VISIBILITY 1
-#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
-#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-#define G_GNUC_INTERNAL __hidden
-#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY)
-#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
-#else
-#define G_GNUC_INTERNAL
-#endif
-
-#define G_THREADS_ENABLED
-#define G_THREADS_IMPL_POSIX
-
-#define G_ATOMIC_LOCK_FREE
-
-#define GINT16_TO_LE(val)	((gint16) (val))
-#define GUINT16_TO_LE(val)	((guint16) (val))
-#define GINT16_TO_BE(val)	((gint16) GUINT16_SWAP_LE_BE (val))
-#define GUINT16_TO_BE(val)	(GUINT16_SWAP_LE_BE (val))
-#define GINT32_TO_LE(val)	((gint32) (val))
-#define GUINT32_TO_LE(val)	((guint32) (val))
-#define GINT32_TO_BE(val)	((gint32) GUINT32_SWAP_LE_BE (val))
-#define GUINT32_TO_BE(val)	(GUINT32_SWAP_LE_BE (val))
-#define GINT64_TO_LE(val)	((gint64) (val))
-#define GUINT64_TO_LE(val)	((guint64) (val))
-#define GINT64_TO_BE(val)	((gint64) GUINT64_SWAP_LE_BE (val))
-#define GUINT64_TO_BE(val)	(GUINT64_SWAP_LE_BE (val))
-#define GLONG_TO_LE(val)	((glong) GINT32_TO_LE (val))
-#define GULONG_TO_LE(val)	((gulong) GUINT32_TO_LE (val))
-#define GLONG_TO_BE(val)	((glong) GINT32_TO_BE (val))
-#define GULONG_TO_BE(val)	((gulong) GUINT32_TO_BE (val))
-#define GINT_TO_LE(val)		((gint) GINT32_TO_LE (val))
-#define GUINT_TO_LE(val)	((guint) GUINT32_TO_LE (val))
-#define GINT_TO_BE(val)		((gint) GINT32_TO_BE (val))
-#define GUINT_TO_BE(val)	((guint) GUINT32_TO_BE (val))
-#define GSIZE_TO_LE(val)	((gsize) GUINT32_TO_LE (val))
-#define GSSIZE_TO_LE(val)	((gssize) GINT32_TO_LE (val))
-#define GSIZE_TO_BE(val)	((gsize) GUINT32_TO_BE (val))
-#define GSSIZE_TO_BE(val)	((gssize) GINT32_TO_BE (val))
-#define G_BYTE_ORDER G_LITTLE_ENDIAN
-
-#define GLIB_SYSDEF_POLLIN =1
-#define GLIB_SYSDEF_POLLOUT =4
-#define GLIB_SYSDEF_POLLPRI =2
-#define GLIB_SYSDEF_POLLHUP =16
-#define GLIB_SYSDEF_POLLERR =8
-#define GLIB_SYSDEF_POLLNVAL =32
-
-#define G_MODULE_SUFFIX "so"
-
-typedef int GPid;
-
-#define GLIB_SYSDEF_AF_UNIX 1
-#define GLIB_SYSDEF_AF_INET 2
-#define GLIB_SYSDEF_AF_INET6 10
-
-#define GLIB_SYSDEF_MSG_OOB 1
-#define GLIB_SYSDEF_MSG_PEEK 2
-#define GLIB_SYSDEF_MSG_DONTROUTE 4
-
-G_END_DECLS
-
-#endif /* __GLIBCONFIG_H__ */
diff --git a/linux-x86/lib/libSDL2.a b/linux-x86/lib/libSDL2.a
deleted file mode 100644
index 9df46d1..0000000
--- a/linux-x86/lib/libSDL2.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libSDL2.la b/linux-x86/lib/libSDL2.la
deleted file mode 100755
index 5e52d63..0000000
--- a/linux-x86/lib/libSDL2.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libSDL2.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libSDL2.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/digit-build-temp-464/install-linux-x86/lib -lm -ldl -lpthread -lrt'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libSDL2.
-current=2
-age=2
-revision=1
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/digit-build-temp-464/install-linux-x86/lib'
diff --git a/linux-x86/lib/libSDL2_test.a b/linux-x86/lib/libSDL2_test.a
deleted file mode 100644
index 72229df..0000000
--- a/linux-x86/lib/libSDL2_test.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libSDL2main.a b/linux-x86/lib/libSDL2main.a
deleted file mode 100644
index 771c427..0000000
--- a/linux-x86/lib/libSDL2main.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libfdt.a b/linux-x86/lib/libfdt.a
deleted file mode 100644
index baadc32..0000000
--- a/linux-x86/lib/libfdt.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libffi-3.2.1/include/ffi.h b/linux-x86/lib/libffi-3.2.1/include/ffi.h
deleted file mode 100644
index 2e7b509..0000000
--- a/linux-x86/lib/libffi-3.2.1/include/ffi.h
+++ /dev/null
@@ -1,487 +0,0 @@
-/* -----------------------------------------------------------------*-C-*-
-   libffi 3.2.1 - Copyright (c) 2011, 2014 Anthony Green
-                    - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation
-   files (the ``Software''), to deal in the Software without
-   restriction, including without limitation the rights to use, copy,
-   modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   ----------------------------------------------------------------------- */
-
-/* -------------------------------------------------------------------
-   The basic API is described in the README file.
-
-   The raw API is designed to bypass some of the argument packing
-   and unpacking on architectures for which it can be avoided.
-
-   The closure API allows interpreted functions to be packaged up
-   inside a C function pointer, so that they can be called as C functions,
-   with no understanding on the client side that they are interpreted.
-   It can also be used in other cases in which it is necessary to package
-   up a user specified parameter and a function pointer as a single
-   function pointer.
-
-   The closure API must be implemented in order to get its functionality,
-   e.g. for use by gij.  Routines are provided to emulate the raw API
-   if the underlying platform doesn't allow faster implementation.
-
-   More details on the raw and cloure API can be found in:
-
-   http://gcc.gnu.org/ml/java/1999-q3/msg00138.html
-
-   and
-
-   http://gcc.gnu.org/ml/java/1999-q3/msg00174.html
-   -------------------------------------------------------------------- */
-
-#ifndef LIBFFI_H
-#define LIBFFI_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Specify which architecture libffi is configured for. */
-#ifndef X86
-#define X86
-#endif
-
-/* ---- System configuration information --------------------------------- */
-
-#include <ffitarget.h>
-
-#ifndef LIBFFI_ASM
-
-#if defined(_MSC_VER) && !defined(__clang__)
-#define __attribute__(X)
-#endif
-
-#include <stddef.h>
-#include <limits.h>
-
-/* LONG_LONG_MAX is not always defined (not if STRICT_ANSI, for example).
-   But we can find it either under the correct ANSI name, or under GNU
-   C's internal name.  */
-
-#define FFI_64_BIT_MAX 9223372036854775807
-
-#ifdef LONG_LONG_MAX
-# define FFI_LONG_LONG_MAX LONG_LONG_MAX
-#else
-# ifdef LLONG_MAX
-#  define FFI_LONG_LONG_MAX LLONG_MAX
-#  ifdef _AIX52 /* or newer has C99 LLONG_MAX */
-#   undef FFI_64_BIT_MAX
-#   define FFI_64_BIT_MAX 9223372036854775807LL
-#  endif /* _AIX52 or newer */
-# else
-#  ifdef __GNUC__
-#   define FFI_LONG_LONG_MAX __LONG_LONG_MAX__
-#  endif
-#  ifdef _AIX /* AIX 5.1 and earlier have LONGLONG_MAX */
-#   ifndef __PPC64__
-#    if defined (__IBMC__) || defined (__IBMCPP__)
-#     define FFI_LONG_LONG_MAX LONGLONG_MAX
-#    endif
-#   endif /* __PPC64__ */
-#   undef  FFI_64_BIT_MAX
-#   define FFI_64_BIT_MAX 9223372036854775807LL
-#  endif
-# endif
-#endif
-
-/* The closure code assumes that this works on pointers, i.e. a size_t	*/
-/* can hold a pointer.							*/
-
-typedef struct _ffi_type
-{
-  size_t size;
-  unsigned short alignment;
-  unsigned short type;
-  struct _ffi_type **elements;
-} ffi_type;
-
-#ifndef LIBFFI_HIDE_BASIC_TYPES
-#if SCHAR_MAX == 127
-# define ffi_type_uchar                ffi_type_uint8
-# define ffi_type_schar                ffi_type_sint8
-#else
- #error "char size not supported"
-#endif
-
-#if SHRT_MAX == 32767
-# define ffi_type_ushort       ffi_type_uint16
-# define ffi_type_sshort       ffi_type_sint16
-#elif SHRT_MAX == 2147483647
-# define ffi_type_ushort       ffi_type_uint32
-# define ffi_type_sshort       ffi_type_sint32
-#else
- #error "short size not supported"
-#endif
-
-#if INT_MAX == 32767
-# define ffi_type_uint         ffi_type_uint16
-# define ffi_type_sint         ffi_type_sint16
-#elif INT_MAX == 2147483647
-# define ffi_type_uint         ffi_type_uint32
-# define ffi_type_sint         ffi_type_sint32
-#elif INT_MAX == 9223372036854775807
-# define ffi_type_uint         ffi_type_uint64
-# define ffi_type_sint         ffi_type_sint64
-#else
- #error "int size not supported"
-#endif
-
-#if LONG_MAX == 2147483647
-# if FFI_LONG_LONG_MAX != FFI_64_BIT_MAX
- #error "no 64-bit data type supported"
-# endif
-#elif LONG_MAX != FFI_64_BIT_MAX
- #error "long size not supported"
-#endif
-
-#if LONG_MAX == 2147483647
-# define ffi_type_ulong        ffi_type_uint32
-# define ffi_type_slong        ffi_type_sint32
-#elif LONG_MAX == FFI_64_BIT_MAX
-# define ffi_type_ulong        ffi_type_uint64
-# define ffi_type_slong        ffi_type_sint64
-#else
- #error "long size not supported"
-#endif
-
-/* Need minimal decorations for DLLs to works on Windows. */
-/* GCC has autoimport and autoexport.  Rely on Libtool to */
-/* help MSVC export from a DLL, but always declare data   */
-/* to be imported for MSVC clients.  This costs an extra  */
-/* indirection for MSVC clients using the static version  */
-/* of the library, but don't worry about that.  Besides,  */
-/* as a workaround, they can define FFI_BUILDING if they  */
-/* *know* they are going to link with the static library. */
-#if defined _MSC_VER && !defined FFI_BUILDING
-#define FFI_EXTERN extern __declspec(dllimport)
-#else
-#define FFI_EXTERN extern
-#endif
-
-/* These are defined in types.c */
-FFI_EXTERN ffi_type ffi_type_void;
-FFI_EXTERN ffi_type ffi_type_uint8;
-FFI_EXTERN ffi_type ffi_type_sint8;
-FFI_EXTERN ffi_type ffi_type_uint16;
-FFI_EXTERN ffi_type ffi_type_sint16;
-FFI_EXTERN ffi_type ffi_type_uint32;
-FFI_EXTERN ffi_type ffi_type_sint32;
-FFI_EXTERN ffi_type ffi_type_uint64;
-FFI_EXTERN ffi_type ffi_type_sint64;
-FFI_EXTERN ffi_type ffi_type_float;
-FFI_EXTERN ffi_type ffi_type_double;
-FFI_EXTERN ffi_type ffi_type_pointer;
-
-#if 1
-FFI_EXTERN ffi_type ffi_type_longdouble;
-#else
-#define ffi_type_longdouble ffi_type_double
-#endif
-
-#ifdef FFI_TARGET_HAS_COMPLEX_TYPE
-FFI_EXTERN ffi_type ffi_type_complex_float;
-FFI_EXTERN ffi_type ffi_type_complex_double;
-#if 1
-FFI_EXTERN ffi_type ffi_type_complex_longdouble;
-#else
-#define ffi_type_complex_longdouble ffi_type_complex_double
-#endif
-#endif
-#endif /* LIBFFI_HIDE_BASIC_TYPES */
-
-typedef enum {
-  FFI_OK = 0,
-  FFI_BAD_TYPEDEF,
-  FFI_BAD_ABI
-} ffi_status;
-
-typedef unsigned FFI_TYPE;
-
-typedef struct {
-  ffi_abi abi;
-  unsigned nargs;
-  ffi_type **arg_types;
-  ffi_type *rtype;
-  unsigned bytes;
-  unsigned flags;
-#ifdef FFI_EXTRA_CIF_FIELDS
-  FFI_EXTRA_CIF_FIELDS;
-#endif
-} ffi_cif;
-
-#if 0
-/* Used to adjust size/alignment of ffi types.  */
-void ffi_prep_types (ffi_abi abi);
-#endif
-
-/* Used internally, but overridden by some architectures */
-ffi_status ffi_prep_cif_core(ffi_cif *cif,
-			     ffi_abi abi,
-			     unsigned int isvariadic,
-			     unsigned int nfixedargs,
-			     unsigned int ntotalargs,
-			     ffi_type *rtype,
-			     ffi_type **atypes);
-
-/* ---- Definitions for the raw API -------------------------------------- */
-
-#ifndef FFI_SIZEOF_ARG
-# if LONG_MAX == 2147483647
-#  define FFI_SIZEOF_ARG        4
-# elif LONG_MAX == FFI_64_BIT_MAX
-#  define FFI_SIZEOF_ARG        8
-# endif
-#endif
-
-#ifndef FFI_SIZEOF_JAVA_RAW
-#  define FFI_SIZEOF_JAVA_RAW FFI_SIZEOF_ARG
-#endif
-
-typedef union {
-  ffi_sarg  sint;
-  ffi_arg   uint;
-  float	    flt;
-  char      data[FFI_SIZEOF_ARG];
-  void*     ptr;
-} ffi_raw;
-
-#if FFI_SIZEOF_JAVA_RAW == 4 && FFI_SIZEOF_ARG == 8
-/* This is a special case for mips64/n32 ABI (and perhaps others) where
-   sizeof(void *) is 4 and FFI_SIZEOF_ARG is 8.  */
-typedef union {
-  signed int	sint;
-  unsigned int	uint;
-  float		flt;
-  char		data[FFI_SIZEOF_JAVA_RAW];
-  void*		ptr;
-} ffi_java_raw;
-#else
-typedef ffi_raw ffi_java_raw;
-#endif
-
-
-void ffi_raw_call (ffi_cif *cif,
-		   void (*fn)(void),
-		   void *rvalue,
-		   ffi_raw *avalue);
-
-void ffi_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw);
-void ffi_raw_to_ptrarray (ffi_cif *cif, ffi_raw *raw, void **args);
-size_t ffi_raw_size (ffi_cif *cif);
-
-/* This is analogous to the raw API, except it uses Java parameter	*/
-/* packing, even on 64-bit machines.  I.e. on 64-bit machines		*/
-/* longs and doubles are followed by an empty 64-bit word.		*/
-
-void ffi_java_raw_call (ffi_cif *cif,
-			void (*fn)(void),
-			void *rvalue,
-			ffi_java_raw *avalue);
-
-void ffi_java_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_java_raw *raw);
-void ffi_java_raw_to_ptrarray (ffi_cif *cif, ffi_java_raw *raw, void **args);
-size_t ffi_java_raw_size (ffi_cif *cif);
-
-/* ---- Definitions for closures ----------------------------------------- */
-
-#if FFI_CLOSURES
-
-#ifdef _MSC_VER
-__declspec(align(8))
-#endif
-typedef struct {
-#if 0
-  void *trampoline_table;
-  void *trampoline_table_entry;
-#else
-  char tramp[FFI_TRAMPOLINE_SIZE];
-#endif
-  ffi_cif   *cif;
-  void     (*fun)(ffi_cif*,void*,void**,void*);
-  void      *user_data;
-#ifdef __GNUC__
-} ffi_closure __attribute__((aligned (8)));
-#else
-} ffi_closure;
-# ifdef __sgi
-#  pragma pack 0
-# endif
-#endif
-
-void *ffi_closure_alloc (size_t size, void **code);
-void ffi_closure_free (void *);
-
-ffi_status
-ffi_prep_closure (ffi_closure*,
-		  ffi_cif *,
-		  void (*fun)(ffi_cif*,void*,void**,void*),
-		  void *user_data);
-
-ffi_status
-ffi_prep_closure_loc (ffi_closure*,
-		      ffi_cif *,
-		      void (*fun)(ffi_cif*,void*,void**,void*),
-		      void *user_data,
-		      void*codeloc);
-
-#ifdef __sgi
-# pragma pack 8
-#endif
-typedef struct {
-#if 0
-  void *trampoline_table;
-  void *trampoline_table_entry;
-#else
-  char tramp[FFI_TRAMPOLINE_SIZE];
-#endif
-  ffi_cif   *cif;
-
-#if !FFI_NATIVE_RAW_API
-
-  /* if this is enabled, then a raw closure has the same layout 
-     as a regular closure.  We use this to install an intermediate 
-     handler to do the transaltion, void** -> ffi_raw*. */
-
-  void     (*translate_args)(ffi_cif*,void*,void**,void*);
-  void      *this_closure;
-
-#endif
-
-  void     (*fun)(ffi_cif*,void*,ffi_raw*,void*);
-  void      *user_data;
-
-} ffi_raw_closure;
-
-typedef struct {
-#if 0
-  void *trampoline_table;
-  void *trampoline_table_entry;
-#else
-  char tramp[FFI_TRAMPOLINE_SIZE];
-#endif
-
-  ffi_cif   *cif;
-
-#if !FFI_NATIVE_RAW_API
-
-  /* if this is enabled, then a raw closure has the same layout 
-     as a regular closure.  We use this to install an intermediate 
-     handler to do the transaltion, void** -> ffi_raw*. */
-
-  void     (*translate_args)(ffi_cif*,void*,void**,void*);
-  void      *this_closure;
-
-#endif
-
-  void     (*fun)(ffi_cif*,void*,ffi_java_raw*,void*);
-  void      *user_data;
-
-} ffi_java_raw_closure;
-
-ffi_status
-ffi_prep_raw_closure (ffi_raw_closure*,
-		      ffi_cif *cif,
-		      void (*fun)(ffi_cif*,void*,ffi_raw*,void*),
-		      void *user_data);
-
-ffi_status
-ffi_prep_raw_closure_loc (ffi_raw_closure*,
-			  ffi_cif *cif,
-			  void (*fun)(ffi_cif*,void*,ffi_raw*,void*),
-			  void *user_data,
-			  void *codeloc);
-
-ffi_status
-ffi_prep_java_raw_closure (ffi_java_raw_closure*,
-		           ffi_cif *cif,
-		           void (*fun)(ffi_cif*,void*,ffi_java_raw*,void*),
-		           void *user_data);
-
-ffi_status
-ffi_prep_java_raw_closure_loc (ffi_java_raw_closure*,
-			       ffi_cif *cif,
-			       void (*fun)(ffi_cif*,void*,ffi_java_raw*,void*),
-			       void *user_data,
-			       void *codeloc);
-
-#endif /* FFI_CLOSURES */
-
-/* ---- Public interface definition -------------------------------------- */
-
-ffi_status ffi_prep_cif(ffi_cif *cif,
-			ffi_abi abi,
-			unsigned int nargs,
-			ffi_type *rtype,
-			ffi_type **atypes);
-
-ffi_status ffi_prep_cif_var(ffi_cif *cif,
-			    ffi_abi abi,
-			    unsigned int nfixedargs,
-			    unsigned int ntotalargs,
-			    ffi_type *rtype,
-			    ffi_type **atypes);
-
-void ffi_call(ffi_cif *cif,
-	      void (*fn)(void),
-	      void *rvalue,
-	      void **avalue);
-
-/* Useful for eliminating compiler warnings */
-#define FFI_FN(f) ((void (*)(void))f)
-
-/* ---- Definitions shared with assembly code ---------------------------- */
-
-#endif
-
-/* If these change, update src/mips/ffitarget.h. */
-#define FFI_TYPE_VOID       0    
-#define FFI_TYPE_INT        1
-#define FFI_TYPE_FLOAT      2    
-#define FFI_TYPE_DOUBLE     3
-#if 1
-#define FFI_TYPE_LONGDOUBLE 4
-#else
-#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
-#endif
-#define FFI_TYPE_UINT8      5   
-#define FFI_TYPE_SINT8      6
-#define FFI_TYPE_UINT16     7 
-#define FFI_TYPE_SINT16     8
-#define FFI_TYPE_UINT32     9
-#define FFI_TYPE_SINT32     10
-#define FFI_TYPE_UINT64     11
-#define FFI_TYPE_SINT64     12
-#define FFI_TYPE_STRUCT     13
-#define FFI_TYPE_POINTER    14
-#define FFI_TYPE_COMPLEX    15
-
-/* This should always refer to the last type code (for sanity checks) */
-#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/linux-x86/lib/libffi-3.2.1/include/ffitarget.h b/linux-x86/lib/libffi-3.2.1/include/ffitarget.h
deleted file mode 100644
index a236677..0000000
--- a/linux-x86/lib/libffi-3.2.1/include/ffitarget.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -----------------------------------------------------------------*-C-*-
-   ffitarget.h - Copyright (c) 2012, 2014  Anthony Green
-                 Copyright (c) 1996-2003, 2010  Red Hat, Inc.
-                 Copyright (C) 2008  Free Software Foundation, Inc.
-
-   Target configuration macros for x86 and x86-64.
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   ``Software''), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject to
-   the following conditions:
-
-   The above copyright notice and this permission notice shall be included
-   in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   ----------------------------------------------------------------------- */
-
-#ifndef LIBFFI_TARGET_H
-#define LIBFFI_TARGET_H
-
-#ifndef LIBFFI_H
-#error "Please do not include ffitarget.h directly into your source.  Use ffi.h instead."
-#endif
-
-/* ---- System specific configurations ----------------------------------- */
-
-/* For code common to all platforms on x86 and x86_64. */
-#define X86_ANY
-
-#if defined (X86_64) && defined (__i386__)
-#undef X86_64
-#define X86
-#endif
-
-#ifdef X86_WIN64
-#define FFI_SIZEOF_ARG 8
-#define USE_BUILTIN_FFS 0 /* not yet implemented in mingw-64 */
-#endif
-
-#define FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION
-#define FFI_TARGET_HAS_COMPLEX_TYPE
-
-/* ---- Generic type definitions ----------------------------------------- */
-
-#ifndef LIBFFI_ASM
-#ifdef X86_WIN64
-#ifdef _MSC_VER
-typedef unsigned __int64       ffi_arg;
-typedef __int64                ffi_sarg;
-#else
-typedef unsigned long long     ffi_arg;
-typedef long long              ffi_sarg;
-#endif
-#else
-#if defined __x86_64__ && defined __ILP32__
-#define FFI_SIZEOF_ARG 8
-#define FFI_SIZEOF_JAVA_RAW  4
-typedef unsigned long long     ffi_arg;
-typedef long long              ffi_sarg;
-#else
-typedef unsigned long          ffi_arg;
-typedef signed long            ffi_sarg;
-#endif
-#endif
-
-typedef enum ffi_abi {
-  FFI_FIRST_ABI = 0,
-
-  /* ---- Intel x86 Win32 ---------- */
-#ifdef X86_WIN32
-  FFI_SYSV,
-  FFI_STDCALL,
-  FFI_THISCALL,
-  FFI_FASTCALL,
-  FFI_MS_CDECL,
-  FFI_PASCAL,
-  FFI_REGISTER,
-  FFI_LAST_ABI,
-#ifdef _MSC_VER
-  FFI_DEFAULT_ABI = FFI_MS_CDECL
-#else
-  FFI_DEFAULT_ABI = FFI_SYSV
-#endif
-
-#elif defined(X86_WIN64)
-  FFI_WIN64,
-  FFI_LAST_ABI,
-  FFI_DEFAULT_ABI = FFI_WIN64
-
-#else
-  /* ---- Intel x86 and AMD x86-64 - */
-  FFI_SYSV,
-  FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
-  FFI_THISCALL,
-  FFI_FASTCALL,
-  FFI_STDCALL,
-  FFI_PASCAL,
-  FFI_REGISTER,
-  FFI_LAST_ABI,
-#if defined(__i386__) || defined(__i386)
-  FFI_DEFAULT_ABI = FFI_SYSV
-#else
-  FFI_DEFAULT_ABI = FFI_UNIX64
-#endif
-#endif
-} ffi_abi;
-#endif
-
-/* ---- Definitions for closures ----------------------------------------- */
-
-#define FFI_CLOSURES 1
-#define FFI_TYPE_SMALL_STRUCT_1B (FFI_TYPE_LAST + 1)
-#define FFI_TYPE_SMALL_STRUCT_2B (FFI_TYPE_LAST + 2)
-#define FFI_TYPE_SMALL_STRUCT_4B (FFI_TYPE_LAST + 3)
-#define FFI_TYPE_MS_STRUCT       (FFI_TYPE_LAST + 4)
-
-#if defined (X86_64) || (defined (__x86_64__) && defined (X86_DARWIN))
-#define FFI_TRAMPOLINE_SIZE 24
-#define FFI_NATIVE_RAW_API 0
-#else
-#ifdef X86_WIN32
-#define FFI_TRAMPOLINE_SIZE 52
-#else
-#ifdef X86_WIN64
-#define FFI_TRAMPOLINE_SIZE 29
-#define FFI_NATIVE_RAW_API 0
-#define FFI_NO_RAW_API 1
-#else
-#define FFI_TRAMPOLINE_SIZE 10
-#endif
-#endif
-#ifndef X86_WIN64
-#define FFI_NATIVE_RAW_API 1  /* x86 has native raw api support */
-#endif
-#endif
-
-#endif
-
diff --git a/linux-x86/lib/libgio-2.0.a b/linux-x86/lib/libgio-2.0.a
deleted file mode 100644
index aac91ee..0000000
--- a/linux-x86/lib/libgio-2.0.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libgio-2.0.la b/linux-x86/lib/libgio-2.0.la
deleted file mode 100755
index 9293a16..0000000
--- a/linux-x86/lib/libgio-2.0.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libgio-2.0.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libgio-2.0.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/digit-build-temp-464/install-linux-x86/lib /tmp/digit-build-temp-464/install-linux-x86/lib/libgobject-2.0.la /tmp/digit-build-temp-464/install-linux-x86/lib/../lib32/libffi.la /tmp/digit-build-temp-464/install-linux-x86/lib/libgmodule-2.0.la -ldl /tmp/digit-build-temp-464/install-linux-x86/lib/libglib-2.0.la -lpthread -lrt -lz -lresolv'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libgio-2.0.
-current=3800
-age=3800
-revision=2
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/digit-build-temp-464/install-linux-x86/lib'
diff --git a/linux-x86/lib/libglib-2.0.a b/linux-x86/lib/libglib-2.0.a
deleted file mode 100644
index b2daf00..0000000
--- a/linux-x86/lib/libglib-2.0.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libglib-2.0.la b/linux-x86/lib/libglib-2.0.la
deleted file mode 100755
index 1121af1..0000000
--- a/linux-x86/lib/libglib-2.0.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libglib-2.0.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libglib-2.0.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/digit-build-temp-464/install-linux-x86/lib -lpthread -lrt'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libglib-2.0.
-current=3800
-age=3800
-revision=2
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/digit-build-temp-464/install-linux-x86/lib'
diff --git a/linux-x86/lib/libgmodule-2.0.a b/linux-x86/lib/libgmodule-2.0.a
deleted file mode 100644
index da87723..0000000
--- a/linux-x86/lib/libgmodule-2.0.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libgmodule-2.0.la b/linux-x86/lib/libgmodule-2.0.la
deleted file mode 100755
index 87d931a..0000000
--- a/linux-x86/lib/libgmodule-2.0.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libgmodule-2.0.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libgmodule-2.0.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/digit-build-temp-464/install-linux-x86/lib -ldl /tmp/digit-build-temp-464/install-linux-x86/lib/libglib-2.0.la -lpthread -lrt'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libgmodule-2.0.
-current=3800
-age=3800
-revision=2
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/digit-build-temp-464/install-linux-x86/lib'
diff --git a/linux-x86/lib/libgobject-2.0.a b/linux-x86/lib/libgobject-2.0.a
deleted file mode 100644
index 9116411..0000000
--- a/linux-x86/lib/libgobject-2.0.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libgobject-2.0.la b/linux-x86/lib/libgobject-2.0.la
deleted file mode 100755
index 9518da2..0000000
--- a/linux-x86/lib/libgobject-2.0.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libgobject-2.0.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libgobject-2.0.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/digit-build-temp-464/install-linux-x86/lib /tmp/digit-build-temp-464/install-linux-x86/lib/libglib-2.0.la -lpthread -lrt /tmp/digit-build-temp-464/install-linux-x86/lib/../lib32/libffi.la'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libgobject-2.0.
-current=3800
-age=3800
-revision=2
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/digit-build-temp-464/install-linux-x86/lib'
diff --git a/linux-x86/lib/libgthread-2.0.a b/linux-x86/lib/libgthread-2.0.a
deleted file mode 100644
index e157c75..0000000
--- a/linux-x86/lib/libgthread-2.0.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libgthread-2.0.la b/linux-x86/lib/libgthread-2.0.la
deleted file mode 100755
index a07dd2e..0000000
--- a/linux-x86/lib/libgthread-2.0.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libgthread-2.0.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libgthread-2.0.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/digit-build-temp-464/install-linux-x86/lib /tmp/digit-build-temp-464/install-linux-x86/lib/libglib-2.0.la -lpthread -lrt'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libgthread-2.0.
-current=3800
-age=3800
-revision=2
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/digit-build-temp-464/install-linux-x86/lib'
diff --git a/linux-x86/lib/libpixman-1.a b/linux-x86/lib/libpixman-1.a
deleted file mode 100644
index 2dea553..0000000
--- a/linux-x86/lib/libpixman-1.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libpixman-1.la b/linux-x86/lib/libpixman-1.la
deleted file mode 100755
index c5a312a..0000000
--- a/linux-x86/lib/libpixman-1.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libpixman-1.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libpixman-1.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=' -pthread'
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/digit-build-temp-464/install-linux-x86/lib -lm'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libpixman-1.
-current=32
-age=32
-revision=4
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/digit-build-temp-464/install-linux-x86/lib'
diff --git a/linux-x86/lib/libpng.a b/linux-x86/lib/libpng.a
deleted file mode 120000
index 5671875..0000000
--- a/linux-x86/lib/libpng.a
+++ /dev/null
@@ -1 +0,0 @@
-libpng16.a
\ No newline at end of file
diff --git a/linux-x86/lib/libpng.la b/linux-x86/lib/libpng.la
deleted file mode 120000
index 3a5dc32..0000000
--- a/linux-x86/lib/libpng.la
+++ /dev/null
@@ -1 +0,0 @@
-libpng16.la
\ No newline at end of file
diff --git a/linux-x86/lib/libpng16.a b/linux-x86/lib/libpng16.a
deleted file mode 100644
index e365608..0000000
--- a/linux-x86/lib/libpng16.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libpng16.la b/linux-x86/lib/libpng16.la
deleted file mode 100755
index f3b3928..0000000
--- a/linux-x86/lib/libpng16.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libpng16.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libpng16.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/digit-build-temp-464/install-linux-x86/lib -lz -lm'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libpng16.
-current=32
-age=16
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/digit-build-temp-464/install-linux-x86/lib'
diff --git a/linux-x86/lib/libz.a b/linux-x86/lib/libz.a
deleted file mode 100644
index a00f443..0000000
--- a/linux-x86/lib/libz.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/libz.so b/linux-x86/lib/libz.so
deleted file mode 120000
index 2bfad1b..0000000
--- a/linux-x86/lib/libz.so
+++ /dev/null
@@ -1 +0,0 @@
-libz.so.1.2.8
\ No newline at end of file
diff --git a/linux-x86/lib/libz.so.1 b/linux-x86/lib/libz.so.1
deleted file mode 120000
index 2bfad1b..0000000
--- a/linux-x86/lib/libz.so.1
+++ /dev/null
@@ -1 +0,0 @@
-libz.so.1.2.8
\ No newline at end of file
diff --git a/linux-x86/lib/libz.so.1.2.8 b/linux-x86/lib/libz.so.1.2.8
deleted file mode 100755
index 1275e36..0000000
--- a/linux-x86/lib/libz.so.1.2.8
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib/pkgconfig/gio-2.0.pc b/linux-x86/lib/pkgconfig/gio-2.0.pc
deleted file mode 100644
index 9320a8d..0000000
--- a/linux-x86/lib/pkgconfig/gio-2.0.pc
+++ /dev/null
@@ -1,18 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-giomoduledir=${libdir}/gio/modules
-glib_compile_schemas=glib-compile-schemas
-glib_compile_resources=glib-compile-resources
-gdbus_codegen=gdbus-codegen
-
-Name: GIO
-Description: glib I/O library
-Version: 2.38.2
-Requires: glib-2.0 gobject-2.0
-Requires.private: gmodule-no-export-2.0
-Libs: -L${libdir} -lgio-2.0 -ldnsapi -liphlpapi
-Libs.private: -L/tmp/digit-build-temp-464/install-linux-x86/lib -lz   -lresolv 
-Cflags:
diff --git a/linux-x86/lib/pkgconfig/gio-unix-2.0.pc b/linux-x86/lib/pkgconfig/gio-unix-2.0.pc
deleted file mode 100644
index e6f62c5..0000000
--- a/linux-x86/lib/pkgconfig/gio-unix-2.0.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: GIO unix specific APIs
-Description: unix specific headers for glib I/O library
-Version: 2.38.2
-Requires: gobject-2.0,gio-2.0
-Libs: -L${libdir} -lgio-2.0
-Cflags: -I${includedir}/gio-unix-2.0/
diff --git a/linux-x86/lib/pkgconfig/glib-2.0.pc b/linux-x86/lib/pkgconfig/glib-2.0.pc
deleted file mode 100644
index bc9cb55..0000000
--- a/linux-x86/lib/pkgconfig/glib-2.0.pc
+++ /dev/null
@@ -1,16 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-glib_genmarshal=${exec_prefix}/bin/glib-genmarshal
-gobject_query=${exec_prefix}/bin/gobject-query
-glib_mkenums=${exec_prefix}/bin/glib-mkenums
-
-Name: GLib
-Description: C Utility Library
-Version: 2.38.2
-Requires.private: 
-Libs: -L${libdir} -lglib-2.0 
-Libs.private: -pthread -lrt    
-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
diff --git a/linux-x86/lib/pkgconfig/gmodule-2.0.pc b/linux-x86/lib/pkgconfig/gmodule-2.0.pc
deleted file mode 100644
index 2ae5563..0000000
--- a/linux-x86/lib/pkgconfig/gmodule-2.0.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-gmodule_supported=true
-
-Name: GModule
-Description: Dynamic module loader for GLib
-Requires: glib-2.0
-Version: 2.38.2
-Libs: -L${libdir} -Wl,--export-dynamic -lgmodule-2.0 -pthread -lrt
-Libs.private: -ldl
-Cflags: -pthread
diff --git a/linux-x86/lib/pkgconfig/gmodule-export-2.0.pc b/linux-x86/lib/pkgconfig/gmodule-export-2.0.pc
deleted file mode 100644
index 2ae5563..0000000
--- a/linux-x86/lib/pkgconfig/gmodule-export-2.0.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-gmodule_supported=true
-
-Name: GModule
-Description: Dynamic module loader for GLib
-Requires: glib-2.0
-Version: 2.38.2
-Libs: -L${libdir} -Wl,--export-dynamic -lgmodule-2.0 -pthread -lrt
-Libs.private: -ldl
-Cflags: -pthread
diff --git a/linux-x86/lib/pkgconfig/gmodule-no-export-2.0.pc b/linux-x86/lib/pkgconfig/gmodule-no-export-2.0.pc
deleted file mode 100644
index 0cefc5c..0000000
--- a/linux-x86/lib/pkgconfig/gmodule-no-export-2.0.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-gmodule_supported=true
-
-Name: GModule
-Description: Dynamic module loader for GLib
-Requires: glib-2.0
-Version: 2.38.2
-Libs: -L${libdir} -lgmodule-2.0 -pthread -lrt
-Libs.private: -ldl
-Cflags: -pthread
diff --git a/linux-x86/lib/pkgconfig/gobject-2.0.pc b/linux-x86/lib/pkgconfig/gobject-2.0.pc
deleted file mode 100644
index 2912398..0000000
--- a/linux-x86/lib/pkgconfig/gobject-2.0.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: GObject
-Description: GLib Type, Object, Parameter and Signal Library
-Requires: glib-2.0
-Version: 2.38.2
-Libs: -L${libdir} -lgobject-2.0
-Libs.private: /tmp/digit-build-temp-464/install-linux-x86/lib32/libffi.la
-Cflags:
diff --git a/linux-x86/lib/pkgconfig/gthread-2.0.pc b/linux-x86/lib/pkgconfig/gthread-2.0.pc
deleted file mode 100644
index 7f167bb..0000000
--- a/linux-x86/lib/pkgconfig/gthread-2.0.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: GThread
-Description: Thread support for GLib
-Requires: glib-2.0
-Version: 2.38.2
-Libs: -L${libdir} -lgthread-2.0 -pthread -lrt
-Cflags: -pthread
diff --git a/linux-x86/lib/pkgconfig/libffi.pc b/linux-x86/lib/pkgconfig/libffi.pc
deleted file mode 100644
index 62cee3d..0000000
--- a/linux-x86/lib/pkgconfig/libffi.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-toolexeclibdir=${exec_prefix}/lib/../lib32
-includedir=${libdir}/libffi-3.2.1/include
-
-Name: libffi
-Description: Library supporting Foreign Function Interfaces
-Version: 3.2.1
-Libs: -L${toolexeclibdir} -lffi
-Cflags: -I${includedir}
diff --git a/linux-x86/lib/pkgconfig/libpng.pc b/linux-x86/lib/pkgconfig/libpng.pc
deleted file mode 120000
index 02f0e64..0000000
--- a/linux-x86/lib/pkgconfig/libpng.pc
+++ /dev/null
@@ -1 +0,0 @@
-libpng16.pc
\ No newline at end of file
diff --git a/linux-x86/lib/pkgconfig/libpng16.pc b/linux-x86/lib/pkgconfig/libpng16.pc
deleted file mode 100644
index ed0c827..0000000
--- a/linux-x86/lib/pkgconfig/libpng16.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/libpng16
-
-Name: libpng
-Description: Loads and saves PNG files
-Version: 1.6.16
-Libs: -L${libdir} -lpng16
-Libs.private: -lm -lz -lm 
-Cflags: -I${includedir}
diff --git a/linux-x86/lib/pkgconfig/pixman-1.pc b/linux-x86/lib/pkgconfig/pixman-1.pc
deleted file mode 100644
index e93f0a5..0000000
--- a/linux-x86/lib/pkgconfig/pixman-1.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Pixman
-Description: The pixman library (version 1)
-Version: 0.32.4
-Cflags: -I${includedir}/pixman-1
-Libs: -L${libdir} -lpixman-1
-
diff --git a/linux-x86/lib/pkgconfig/sdl2.pc b/linux-x86/lib/pkgconfig/sdl2.pc
deleted file mode 100644
index 481cb9c..0000000
--- a/linux-x86/lib/pkgconfig/sdl2.pc
+++ /dev/null
@@ -1,15 +0,0 @@
-# sdl pkg-config source file
-
-prefix=/tmp/digit-build-temp-13090/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: sdl2
-Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.
-Version: 2.0.3
-Requires:
-Conflicts:
-Libs: -L${libdir} -Wl,-rpath,${libdir} -lSDL2  -lpthread -Wl,--no-undefined -lm -ldl -lrt
-Libs.private: -lSDL2  -lpthread  -Wl,--no-undefined -lm -ldl -lpthread -lrt
-Cflags: -I${includedir}/SDL2   -D_REENTRANT
diff --git a/linux-x86/lib/pkgconfig/zlib.pc b/linux-x86/lib/pkgconfig/zlib.pc
deleted file mode 100644
index 00cdced..0000000
--- a/linux-x86/lib/pkgconfig/zlib.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/tmp/digit-build-temp-464/install-linux-x86
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-sharedlibdir=${libdir}
-includedir=${prefix}/include
-
-Name: zlib
-Description: zlib compression library
-Version: 1.2.8
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz
-Cflags: -I${includedir}
diff --git a/linux-x86/lib32/libffi.a b/linux-x86/lib32/libffi.a
deleted file mode 100644
index f24a9cc..0000000
--- a/linux-x86/lib32/libffi.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/lib32/libffi.la b/linux-x86/lib32/libffi.la
deleted file mode 100755
index b591147..0000000
--- a/linux-x86/lib32/libffi.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libffi.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libffi.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/tmp/digit-build-temp-464/install-linux-x86/lib'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libffi.
-current=6
-age=0
-revision=4
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/tmp/digit-build-temp-464/install-linux-x86/lib/../lib32'
diff --git a/linux-x86/timestamps/qemu-android-deps b/linux-x86/timestamps/qemu-android-deps
deleted file mode 100644
index e69de29..0000000
--- a/linux-x86/timestamps/qemu-android-deps
+++ /dev/null
diff --git a/linux-x86_64/bin/gdbus b/linux-x86_64/bin/gdbus
index 1ce4763..ae5b05b 100755
--- a/linux-x86_64/bin/gdbus
+++ b/linux-x86_64/bin/gdbus
Binary files differ
diff --git a/linux-x86_64/bin/gdbus-codegen b/linux-x86_64/bin/gdbus-codegen
index cb7c20b..3ab1d63 100755
--- a/linux-x86_64/bin/gdbus-codegen
+++ b/linux-x86_64/bin/gdbus-codegen
@@ -33,7 +33,7 @@
     # Makes gdbus-codegen 'relocatable' at runtime on Windows.
     path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
 else:
-    path = os.path.join('/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/share', 'glib-2.0')
+    path = os.path.join('/tmp/zyy-build-temp-120638/install-linux-x86_64/share', 'glib-2.0')
 
 sys.path.insert(0, os.path.abspath(path))
 from codegen import codegen_main
diff --git a/linux-x86_64/bin/gio-querymodules b/linux-x86_64/bin/gio-querymodules
index 0f1301e..ab86b8e 100755
--- a/linux-x86_64/bin/gio-querymodules
+++ b/linux-x86_64/bin/gio-querymodules
Binary files differ
diff --git a/linux-x86_64/bin/glib-compile-resources b/linux-x86_64/bin/glib-compile-resources
index 9f21a99..48bc564 100755
--- a/linux-x86_64/bin/glib-compile-resources
+++ b/linux-x86_64/bin/glib-compile-resources
Binary files differ
diff --git a/linux-x86_64/bin/glib-compile-schemas b/linux-x86_64/bin/glib-compile-schemas
index 320ede2..eb5356e 100755
--- a/linux-x86_64/bin/glib-compile-schemas
+++ b/linux-x86_64/bin/glib-compile-schemas
Binary files differ
diff --git a/linux-x86_64/bin/glib-genmarshal b/linux-x86_64/bin/glib-genmarshal
index bba7108..cce4c67 100755
--- a/linux-x86_64/bin/glib-genmarshal
+++ b/linux-x86_64/bin/glib-genmarshal
Binary files differ
diff --git a/linux-x86_64/bin/glib-gettextize b/linux-x86_64/bin/glib-gettextize
index 91ef310..392212c 100755
--- a/linux-x86_64/bin/glib-gettextize
+++ b/linux-x86_64/bin/glib-gettextize
@@ -42,7 +42,7 @@
 try_ln_s=:
 
 # Directory where the sources are stored.
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 case `uname` in
 MINGW32*)
     prefix="`dirname $0`/.."
diff --git a/linux-x86_64/bin/gobject-query b/linux-x86_64/bin/gobject-query
index 26278d7..c988e93 100755
--- a/linux-x86_64/bin/gobject-query
+++ b/linux-x86_64/bin/gobject-query
Binary files differ
diff --git a/linux-x86_64/bin/gresource b/linux-x86_64/bin/gresource
index 015884f..7c7bfc5 100755
--- a/linux-x86_64/bin/gresource
+++ b/linux-x86_64/bin/gresource
Binary files differ
diff --git a/linux-x86_64/bin/gsettings b/linux-x86_64/bin/gsettings
index 589cdc1..0e65279 100755
--- a/linux-x86_64/bin/gsettings
+++ b/linux-x86_64/bin/gsettings
Binary files differ
diff --git a/linux-x86_64/bin/gtester b/linux-x86_64/bin/gtester
index d69d444..669d1c4 100755
--- a/linux-x86_64/bin/gtester
+++ b/linux-x86_64/bin/gtester
Binary files differ
diff --git a/linux-x86_64/bin/libpng16-config b/linux-x86_64/bin/libpng16-config
index e853af9..38dd4e9 100755
--- a/linux-x86_64/bin/libpng16-config
+++ b/linux-x86_64/bin/libpng16-config
@@ -12,7 +12,7 @@
 # Modeled after libxml-config.
 
 version="1.6.16"
-prefix="/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64"
+prefix="/tmp/zyy-build-temp-120638/install-linux-x86_64"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"
 includedir="${prefix}/include/libpng16"
diff --git a/linux-x86_64/bin/pkg-config b/linux-x86_64/bin/pkg-config
index c143c5c..344d0ea 100755
--- a/linux-x86_64/bin/pkg-config
+++ b/linux-x86_64/bin/pkg-config
Binary files differ
diff --git a/linux-x86_64/bin/png-fix-itxt b/linux-x86_64/bin/png-fix-itxt
index 3f76ba7..07b6692 100755
--- a/linux-x86_64/bin/png-fix-itxt
+++ b/linux-x86_64/bin/png-fix-itxt
Binary files differ
diff --git a/linux-x86_64/bin/pngfix b/linux-x86_64/bin/pngfix
index a87686f..5203fb9 100755
--- a/linux-x86_64/bin/pngfix
+++ b/linux-x86_64/bin/pngfix
Binary files differ
diff --git a/linux-x86_64/bin/sdl2-config b/linux-x86_64/bin/sdl2-config
index 8464d67..1e25a34 100755
--- a/linux-x86_64/bin/sdl2-config
+++ b/linux-x86_64/bin/sdl2-config
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 exec_prefix_set=no
 libdir=${exec_prefix}/lib
diff --git a/linux-x86_64/include/libpng16/pnglibconf.h b/linux-x86_64/include/libpng16/pnglibconf.h
index 42a195b..13a566c 100644
--- a/linux-x86_64/include/libpng16/pnglibconf.h
+++ b/linux-x86_64/include/libpng16/pnglibconf.h
@@ -198,7 +198,7 @@
 #define PNG_TEXT_Z_DEFAULT_STRATEGY 0
 #define PNG_WEIGHT_SHIFT 8
 #define PNG_ZBUF_SIZE 8192
-#define PNG_ZLIB_VERNUM 0x1280
+#define PNG_ZLIB_VERNUM 0x12a0
 #define PNG_Z_DEFAULT_COMPRESSION (-1)
 #define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
 #define PNG_Z_DEFAULT_STRATEGY 1
diff --git a/linux-x86_64/include/zconf.h b/linux-x86_64/include/zconf.h
index 996fff2..77398c1 100644
--- a/linux-x86_64/include/zconf.h
+++ b/linux-x86_64/include/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -17,7 +17,7 @@
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
 #  define Z_PREFIX_SET
 
-/* all linked symbols */
+/* all linked symbols and init macros */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
@@ -29,6 +29,7 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
 #  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
@@ -37,10 +38,14 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
 #  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
@@ -67,6 +72,8 @@
 #    define gzeof                 z_gzeof
 #    define gzerror               z_gzerror
 #    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
 #    define gzgetc                z_gzgetc
 #    define gzgetc_               z_gzgetc_
 #    define gzgets                z_gzgets
@@ -78,7 +85,6 @@
 #      define gzopen_w              z_gzopen_w
 #    endif
 #    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
 #    define gzread                z_gzread
@@ -89,32 +95,39 @@
 #    define gztell                z_gztell
 #    define gztell64              z_gztell64
 #    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
 #    define gzwrite               z_gzwrite
 #  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
 #  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
 #  define inflateCopy           z_inflateCopy
 #  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
 #  define inflateInit2_         z_inflateInit2_
 #  define inflateInit_          z_inflateInit_
 #  define inflateMark           z_inflateMark
 #  define inflatePrime          z_inflatePrime
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
 #  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateValidate       z_inflateValidate
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
 #  ifndef Z_SOLO
 #    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
 #  endif
 #  define zError                z_zError
 #  ifndef Z_SOLO
@@ -224,9 +237,19 @@
 #  define z_const
 #endif
 
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
 #endif
 
 /* Maximum value for memLevel in deflateInit2 */
@@ -256,7 +279,7 @@
  Of course this will generally degrade compression (there's no free lunch).
 
    The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
  for small objects.
 */
 
diff --git a/linux-x86_64/include/zlib.h b/linux-x86_64/include/zlib.h
index 3e0c767..dc90dc8 100644
--- a/linux-x86_64/include/zlib.h
+++ b/linux-x86_64/include/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
+  version 1.2.10, January 2nd, 2017
 
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
+#define ZLIB_VERSION "1.2.10"
+#define ZLIB_VERNUM 0x12a0
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_REVISION 10
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -65,7 +65,8 @@
   with "gz".  The gzip format is different from the zlib format.  gzip is a
   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
 
-    This library can optionally read and write gzip streams in memory as well.
+    This library can optionally read and write gzip and raw deflate streams in
+  memory as well.
 
     The zlib format was designed to be compact and fast for use in memory
   and on communications channels.  The gzip format was designed for single-
@@ -74,7 +75,7 @@
 
     The library does not install any signal handler.  The decoder checks
   the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
+  even in the case of corrupted input.
 */
 
 typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -87,7 +88,7 @@
     uInt     avail_in;  /* number of bytes available at next_in */
     uLong    total_in;  /* total number of input bytes read so far */
 
-    Bytef    *next_out; /* next output byte should be put there */
+    Bytef    *next_out; /* next output byte will go here */
     uInt     avail_out; /* remaining free space at next_out */
     uLong    total_out; /* total number of bytes output so far */
 
@@ -98,8 +99,9 @@
     free_func  zfree;   /* used to free the internal state */
     voidpf     opaque;  /* private data object passed to zalloc and zfree */
 
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
+    int     data_type;  /* best guess about the data type: binary or text
+                           for deflate, or the decoding state for inflate */
+    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
     uLong   reserved;   /* reserved for future use */
 } z_stream;
 
@@ -142,7 +144,9 @@
 
      zalloc must return Z_NULL if there is not enough memory for the object.
    If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
+   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
+   Z_NULL on entry to the initialization function, they are set to internal
+   routines that use the standard library functions malloc() and free().
 
      On 16-bit systems, the functions zalloc and zfree must be able to allocate
    exactly 65536 bytes, but will not be required to allocate more than this if
@@ -155,7 +159,7 @@
 
      The fields total_in and total_out can be used for statistics or progress
    reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
+   uncompressed data and may be saved for use by the decompressor (particularly
    if the decompressor wants to decompress everything in a single step).
 */
 
@@ -200,7 +204,7 @@
 #define Z_TEXT     1
 #define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
 #define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
+/* Possible values of the data_type field for deflate() */
 
 #define Z_DEFLATED   8
 /* The deflate compression method (the only one supported in this version) */
@@ -258,11 +262,11 @@
     enough room in the output buffer), next_in and avail_in are updated and
     processing will resume at this point for the next call of deflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  This action is forced if the parameter flush is non zero.
     Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
+    should be set only when necessary.  Some output may be provided even if
+    flush is zero.
 
     Before the call of deflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
@@ -271,7 +275,9 @@
   output when it wants, for example when the output buffer is full (avail_out
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
+  buffer because there might be more output pending. See deflatePending(),
+  which can be used if desired to determine whether or not there is more ouput
+  in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
   decide how much data to accumulate before producing output, in order to
@@ -292,8 +298,8 @@
   input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
   This completes the current deflate block and follows it with an empty fixed
   codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
+  in order for the decompressor to finish the block before the empty fixed
+  codes block.
 
     If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
   for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
@@ -319,34 +325,38 @@
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
   pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
+  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
+  function must be called again with Z_FINISH and more output space (updated
+  avail_out) but no more input data, until it returns with Z_STREAM_END or an
+  error.  After deflate has returned Z_STREAM_END, the only possible operations
+  on the stream are deflateReset or deflateEnd.
 
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
-  not return Z_STREAM_END, and it must be called again as described above.
+    Z_FINISH can be used in the first deflate call after deflateInit if all the
+  compression is to be done in a single step.  In order to complete in one
+  call, avail_out must be at least the value returned by deflateBound (see
+  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
+  output space is provided, deflate will not return Z_STREAM_END, and it must
+  be called again as described above.
 
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
+    deflate() sets strm->adler to the Adler-32 checksum of all input read
+  so far (that is, total_in bytes).  If a gzip stream is being generated, then
+  strm->adler will be the CRC-32 checksum of the input read so far.  (See
+  deflateInit2 below.)
 
     deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
+  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
+  considered binary.  This field is only for information purposes and does not
+  affect the compression algorithm in any manner.
 
     deflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if all input has been
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
+  if next_in or next_out was Z_NULL or the state was inadvertently written over
+  by the application), or Z_BUF_ERROR if no progress is possible (for example
+  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
+  deflate() can be called again with more input and more output space to
+  continue compressing.
 */
 
 
@@ -369,23 +379,21 @@
 
      Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
+   the caller.  In the current version of inflate, the provided input is not
+   read or consumed.  The allocation of a sliding window will be deferred to
+   the first call of inflate (if the decompression does not complete on the
+   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
+   them to use default allocation functions.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
    version assumed by the caller, or Z_STREAM_ERROR if the parameters are
    invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
+   there is no error message.  inflateInit does not perform any decompression.
+   Actual decompression will be done by inflate().  So next_in, and avail_in,
+   next_out, and avail_out are unused and unchanged.  The current
+   implementation of inflateInit() does not process any header information --
+   that is deferred until inflate() is called.
 */
 
 
@@ -401,17 +409,20 @@
 
   - Decompress more input starting at next_in and update next_in and avail_in
     accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
+    enough room in the output buffer), then next_in and avail_in are updated
+    accordingly, and processing will resume at this point for the next call of
+    inflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  inflate() provides as much output as possible, until there is
     no more input data or no more space in the output buffer (see below about
     the flush parameter).
 
     Before the call of inflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
+  output, and updating the next_* and avail_* values accordingly.  If the
+  caller of inflate() does not provide both available input and available
+  output space, it is possible that there will be no progress made.  The
   application can consume the uncompressed output when it wants, for example
   when the output buffer is full (avail_out == 0), or after each call of
   inflate().  If inflate returns Z_OK and with zero avail_out, it must be
@@ -428,7 +439,7 @@
   gets to the end of that block, or when it runs out of data.
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
+  To assist in this, on return inflate() always sets strm->data_type to the
   number of unused bits in the last byte taken from strm->next_in, plus 64 if
   inflate() is currently decoding the last block in the deflate stream, plus
   128 if inflate() returned immediately after decoding an end-of-block code or
@@ -454,7 +465,7 @@
   this case all pending input is processed and all pending output is flushed;
   avail_out must be large enough to hold all of the uncompressed data for the
   operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  saved by the compressor for this purpose.)  The use of Z_FINISH is not
   required to perform an inflation in one step.  However it may be used to
   inform inflate that a faster approach can be used for the single inflate()
   call.  Z_FINISH also informs inflate to not maintain a sliding window if the
@@ -476,32 +487,33 @@
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
   strm->adler to the Adler-32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
+  below.  At the end of the stream, inflate() checks that its computed Adler-32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
   only if the checksum is correct.
 
     inflate() can decompress and check either zlib-wrapped or gzip-wrapped
   deflate data.  The header type is detected automatically, if requested when
   initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
+  header is not retained unless inflateGetHeader() is used.  When processing
   gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
+  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
+  uncompressed length, modulo 2^32.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
   been reached and all uncompressed output has been produced, Z_NEED_DICT if a
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
   corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  value, in which case strm->msg points to a string with a more specific
+  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  next_in or next_out was Z_NULL, or the state was inadvertently written over
+  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
+  if no progress was possible or if there was not enough room in the output
+  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
   inflate() can be called again with more input and more output space to
   continue decompressing.  If Z_DATA_ERROR is returned, the application may
   then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
+  recovery of the data is to be attempted.
 */
 
 
@@ -511,9 +523,8 @@
    This function discards any unprocessed input and does not flush any pending
    output.
 
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
+     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
+   was inconsistent.
 */
 
 
@@ -544,16 +555,29 @@
    compression at the expense of memory usage.  The default value is 15 if
    deflateInit is used instead.
 
+     For the current implementation of deflate(), a windowBits value of 8 (a
+   window size of 256 bytes) is not supported.  As a result, a request for 8
+   will result in 9 (a 512-byte window).  In that case, providing 8 to
+   inflateInit2() will result in an error when the zlib header with 9 is
+   checked against the initialization of inflate().  The remedy is to not use 8
+   with deflateInit2() with this initialization, or at least in that case use 9
+   with inflateInit2().
+
      windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
    determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
+   with no zlib header or trailer, and will not compute a check value.
 
      windowBits can also be greater than 15 for optional gzip encoding.  Add
    16 to windowBits to write a simple gzip header and trailer around the
    compressed data instead of a zlib wrapper.  The gzip header will have no
    file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+   header crc, and the operating system will be set to the appropriate value,
+   if the operating system was determined at compile time.  If a gzip stream is
+   being written, strm->adler is a CRC-32 instead of an Adler-32.
+
+     For raw deflate or gzip encoding, a request for a 256-byte window is
+   rejected as invalid, since only the zlib header provides a means of
+   transmitting the window size to the decompressor.
 
      The memLevel parameter specifies how much memory should be allocated
    for the internal compression state.  memLevel=1 uses minimum memory but is
@@ -614,12 +638,12 @@
    addition, the current implementation of deflate will use at most the window
    size minus 262 bytes of the provided dictionary.
 
-     Upon return of this function, strm->adler is set to the adler32 value
+     Upon return of this function, strm->adler is set to the Adler-32 value
    of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
+   which dictionary has been used by the compressor.  (The Adler-32 value
    applies to the whole dictionary even if only a subset of the dictionary is
    actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
+   Adler-32 value is not computed and strm->adler is not set.
 
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
@@ -628,6 +652,28 @@
    not perform any compression: this will be done by deflate().
 */
 
+ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by deflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If deflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     deflateGetDictionary() may return a length less than the window size, even
+   when more than the window size in input has been provided. It may return up
+   to 258 bytes less in that case, due to how zlib's implementation of deflate
+   manages the sliding window and lookahead for matches, where matches can be
+   up to 258 bytes long. If the application needs the last window-size bytes of
+   input, then that would need to be saved by the application outside of zlib.
+
+     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
                                     z_streamp source));
 /*
@@ -648,10 +694,10 @@
 
 ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
 /*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
+     This function is equivalent to deflateEnd followed by deflateInit, but
+   does not free and reallocate the internal compression state.  The stream
+   will leave the compression level and any other attributes that may have been
+   set unchanged.
 
      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL).
@@ -662,20 +708,35 @@
                                       int strategy));
 /*
      Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
+   interpretation of level and strategy is as in deflateInit2().  This can be
    used to switch between compression and straight copy of the input data, or
    to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
+   If the compression approach (which is a function of the level) or the
+   strategy is changed, then the input available so far is compressed with the
+   old level and strategy using deflate(strm, Z_BLOCK).  There are three
+   approaches for the compression levels 0, 1..3, and 4..9 respectively.  The
+   new level and strategy will take effect at the next call of deflate().
 
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
+     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
+   not have enough output space to complete, then the parameter change will not
+   take effect.  In this case, deflateParams() can be called again with the
+   same parameters and more output space to try again.
 
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
+     In order to assure a change in the parameters on the first try, the
+   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
+   request until strm.avail_out is not zero, before calling deflateParams().
+   Then no more input data should be provided before the deflateParams() call.
+   If this is done, the old level and strategy will be applied to the data
+   compressed before deflateParams(), and the new level and strategy will be
+   applied to the the data compressed after deflateParams().
+
+     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
+   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
+   there was not enough output space to complete the compression of the
+   available input data before a change in the strategy or approach.  Note that
+   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
+   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
+   retried with more output space.
 */
 
 ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@@ -793,7 +854,7 @@
    is for use with other formats that use the deflate compressed data format
    such as zip.  Those formats provide their own check values.  If a custom
    format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
+   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
    the uncompressed data as is done in the zlib, gzip, and zip formats.  For
    most applications, the zlib format should be used as is.  Note that comments
    above on the use in deflateInit2() applies to the magnitude of windowBits.
@@ -802,7 +863,10 @@
    32 to windowBits to enable zlib and gzip decoding with automatic header
    detection, or add 16 to decode only the gzip format (the zlib format will
    return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
+   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
+   below), inflate() will not automatically decode concatenated gzip streams.
+   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
+   would need to be reset to continue decoding a subsequent gzip stream.
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -823,7 +887,7 @@
      Initializes the decompression dictionary from the given uncompressed byte
    sequence.  This function must be called immediately after a call of inflate,
    if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
+   can be determined from the Adler-32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
    deflateSetDictionary).  For raw inflate, this function can be called at any
    time to set the dictionary.  If the provided dictionary is smaller than the
@@ -834,7 +898,7 @@
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
@@ -892,7 +956,7 @@
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
+   but does not free and reallocate the internal decompression state.  The
    stream will keep attributes that may have been set by inflateInit2.
 
      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
@@ -904,7 +968,9 @@
 /*
      This function is the same as inflateReset, but it also permits changing
    the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
+   the same as it is for inflateInit2.  If the window size is changed, then the
+   memory allocated for the window is freed, and the window will be reallocated
+   by inflate() if needed.
 
      inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL), or if
@@ -956,7 +1022,7 @@
    location in the input stream can be determined from avail_in and data_type
    as noted in the description for the Z_BLOCK flush parameter for inflate.
 
-     inflateMark returns the value noted above or -1 << 16 if the provided
+     inflateMark returns the value noted above, or -65536 if the provided
    source stream state was inconsistent.
 */
 
@@ -1048,9 +1114,9 @@
    This routine would normally be used in a utility that reads zip or gzip
    files and writes out uncompressed files.  The utility would decode the
    header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
+   the raw deflate stream to decompress.  This is different from the default
+   behavior of inflate(), which expects a zlib header and trailer around the
+   deflate stream.
 
      inflateBack() uses two subroutines supplied by the caller that are then
    called by inflateBack() for input and output.  inflateBack() calls those
@@ -1059,12 +1125,12 @@
    parameters and return types are defined above in the in_func and out_func
    typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
    number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
+   there is no input available, in() must return zero -- buf is ignored in that
+   case -- and inflateBack() will return a buffer error.  inflateBack() will
+   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
+   out() should return zero on success, or non-zero on failure.  If out()
+   returns non-zero, inflateBack() will return with an error.  Neither in() nor
+   out() are permitted to change the contents of the window provided to
    inflateBackInit(), which is also the buffer that out() uses to write from.
    The length written by out() will be at most the window size.  Any non-zero
    amount of input may be provided by in().
@@ -1092,7 +1158,7 @@
    using strm->next_in which will be Z_NULL only if in() returned an error.  If
    strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
    non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
+   assured to be defined if out() returns non-zero.)  Note that inflateBack()
    cannot return Z_OK.
 */
 
@@ -1114,7 +1180,7 @@
      7.6: size of z_off_t
 
     Compiler, assembler, and debug options:
-     8: DEBUG
+     8: ZLIB_DEBUG
      9: ASMV or ASMINF -- use ASM code
      10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
      11: 0 (reserved)
@@ -1164,7 +1230,8 @@
    the byte length of the source buffer.  Upon entry, destLen is the total size
    of the destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.  compress() is equivalent to compress2() with a level
+   parameter of Z_DEFAULT_COMPRESSION.
 
      compress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1180,7 +1247,7 @@
    length of the source buffer.  Upon entry, destLen is the total size of the
    destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
@@ -1203,7 +1270,7 @@
    uncompressed data.  (The size of the uncompressed data must have been saved
    previously by the compressor and transmitted to the decompressor by some
    mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
+   is the actual size of the uncompressed data.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1212,6 +1279,14 @@
    buffer with the uncompressed data up to that point.
 */
 
+ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
+                                    const Bytef *source, uLong *sourceLen));
+/*
+     Same as uncompress, except that sourceLen is a pointer, where the
+   length of the source is *sourceLen.  On return, *sourceLen is the number of
+   source bytes consumed.
+*/
+
                         /* gzip file access functions */
 
 /*
@@ -1290,10 +1365,9 @@
    default buffer size is 8192 bytes.  This function must be called after
    gzopen() or gzdopen(), and before any other calls that read or write the
    file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
+   write.  Three times that size in buffer space is allocated.  A larger buffer
+   size of, for example, 64K or 128K bytes will noticeably increase the speed
+   of decompression (reading).
 
      The new buffer size also affects the maximum length for gzprintf().
 
@@ -1304,10 +1378,12 @@
 ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
      Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
+   of deflateInit2 for the meaning of these parameters.  Previously provided
+   data is flushed before the parameter change.
 
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
+     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
+   opened for writing, Z_ERRNO if there is an error writing the flushed data,
+   or Z_MEM_ERROR if there is a memory allocation error.
 */
 
 ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
@@ -1335,7 +1411,35 @@
    case.
 
      gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
+   len for end of file, or -1 for error.  If len is too large to fit in an int,
+   then nothing is read, -1 is returned, and the error state is set to
+   Z_STREAM_ERROR.
+*/
+
+ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
+                                     gzFile file));
+/*
+     Read up to nitems items of size size from file to buf, otherwise operating
+   as gzread() does.  This duplicates the interface of stdio's fread(), with
+   size_t request and return types.  If the library defines size_t, then
+   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
+   integer type that can contain a pointer.
+
+     gzfread() returns the number of full items read of size size, or zero if
+   the end of the file was reached and a full item could not be read, or if
+   there was an error.  gzerror() must be consulted if zero is returned in
+   order to determine if there was an error.  If the multiplication of size and
+   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
+   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
+
+     In the event that the end of file is reached and only a partial item is
+   available at the end, i.e. the remaining uncompressed data length is not a
+   multiple of size, then the final partial item is nevetheless read into buf
+   and the end-of-file flag is set.  The length of the partial item read is not
+   provided, but could be inferred from the result of gztell().  This behavior
+   is the same as the behavior of fread() implementations in common libraries,
+   but it prevents the direct use of gzfread() to read a concurrently written
+   file, reseting and retrying on end-of-file, when size is not 1.
 */
 
 ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
@@ -1346,19 +1450,33 @@
    error.
 */
 
+ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
+                                      z_size_t nitems, gzFile file));
+/*
+     gzfwrite() writes nitems items of size size from buf to file, duplicating
+   the interface of stdio's fwrite(), with size_t request and return types.  If
+   the library defines size_t, then z_size_t is identical to size_t.  If not,
+   then z_size_t is an unsigned integer type that can contain a pointer.
+
+     gzfwrite() returns the number of full items written of size size, or zero
+   if there was an error.  If the multiplication of size and nitems overflows,
+   i.e. the product does not fit in a z_size_t, then nothing is written, zero
+   is returned, and the error state is set to Z_STREAM_ERROR.
+*/
+
 ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
 /*
      Converts, formats, and writes the arguments to the compressed file under
    control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
+   uncompressed bytes actually written, or a negative zlib error code in case
+   of error.  The number of uncompressed bytes written is limited to 8191, or
+   one less than the buffer size given to gzbuffer().  The caller should assure
+   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
+   return an error (0) with nothing written.  In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   because the secure snprintf() or vsnprintf() functions were not available.
+   This can be determined using zlibCompileFlags().
 */
 
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
@@ -1418,7 +1536,7 @@
      If the flush parameter is Z_FINISH, the remaining data is written and the
    gzip stream is completed in the output.  If gzwrite() is called again, a new
    gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
+   concatenated gzip streams.
 
      gzflush should be called only when strictly necessary because it will
    degrade compression if called too often.
@@ -1572,7 +1690,7 @@
    return the updated checksum.  If buf is Z_NULL, this function returns the
    required initial value for the checksum.
 
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
    much faster.
 
    Usage example:
@@ -1585,6 +1703,12 @@
      if (adler != original_adler) error();
 */
 
+ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
+                                    z_size_t len));
+/*
+     Same as adler32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
                                           z_off_t len2));
@@ -1614,6 +1738,12 @@
      if (crc != original_crc) error();
 */
 
+ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
+                                  z_size_t len));
+/*
+     Same as crc32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 
@@ -1644,19 +1774,35 @@
                                          unsigned char FAR *window,
                                          const char *version,
                                          int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
+#ifdef Z_PREFIX_SET
+#  define z_deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define z_inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#else
+#  define deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#endif
 
 #ifndef Z_SOLO
 
@@ -1676,10 +1822,10 @@
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #else
 #  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
@@ -1737,19 +1883,16 @@
 
 #endif /* !Z_SOLO */
 
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
 /* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
 ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                             const char *mode));
 #endif
diff --git a/linux-x86_64/lib/libSDL2.a b/linux-x86_64/lib/libSDL2.a
index eafebac..4857fc7 100644
--- a/linux-x86_64/lib/libSDL2.a
+++ b/linux-x86_64/lib/libSDL2.a
Binary files differ
diff --git a/linux-x86_64/lib/libSDL2.la b/linux-x86_64/lib/libSDL2.la
index fd44ffc..7618432 100755
--- a/linux-x86_64/lib/libSDL2.la
+++ b/linux-x86_64/lib/libSDL2.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib -lm -ldl -lpthread -lrt'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-linux-x86_64/lib -lm -ldl -lpthread -lrt'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-linux-x86_64/lib'
diff --git a/linux-x86_64/lib/libSDL2_test.a b/linux-x86_64/lib/libSDL2_test.a
index 33b7298..fc0a257 100644
--- a/linux-x86_64/lib/libSDL2_test.a
+++ b/linux-x86_64/lib/libSDL2_test.a
Binary files differ
diff --git a/linux-x86_64/lib/libSDL2main.a b/linux-x86_64/lib/libSDL2main.a
index 5e020f0..267df5b 100644
--- a/linux-x86_64/lib/libSDL2main.a
+++ b/linux-x86_64/lib/libSDL2main.a
Binary files differ
diff --git a/linux-x86_64/lib/libfdt.a b/linux-x86_64/lib/libfdt.a
index 24f14a3..e47127c 100644
--- a/linux-x86_64/lib/libfdt.a
+++ b/linux-x86_64/lib/libfdt.a
Binary files differ
diff --git a/linux-x86_64/lib/libgio-2.0.a b/linux-x86_64/lib/libgio-2.0.a
index 8998667..8774446 100644
--- a/linux-x86_64/lib/libgio-2.0.a
+++ b/linux-x86_64/lib/libgio-2.0.a
Binary files differ
diff --git a/linux-x86_64/lib/libgio-2.0.la b/linux-x86_64/lib/libgio-2.0.la
index 8af2a75..d389efd 100755
--- a/linux-x86_64/lib/libgio-2.0.la
+++ b/linux-x86_64/lib/libgio-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib/libgobject-2.0.la /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib/../lib64/libffi.la /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib/libgmodule-2.0.la -ldl /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib/libglib-2.0.la -lpthread -lrt -lz -lresolv'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-linux-x86_64/lib /tmp/zyy-build-temp-120638/install-linux-x86_64/lib/libgobject-2.0.la /tmp/zyy-build-temp-120638/install-linux-x86_64/lib/../lib64/libffi.la /tmp/zyy-build-temp-120638/install-linux-x86_64/lib/libgmodule-2.0.la -ldl /tmp/zyy-build-temp-120638/install-linux-x86_64/lib/libglib-2.0.la -lpthread -lrt -lz -lresolv'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-linux-x86_64/lib'
diff --git a/linux-x86_64/lib/libglib-2.0.a b/linux-x86_64/lib/libglib-2.0.a
index 33a5ae3..ae2026a 100644
--- a/linux-x86_64/lib/libglib-2.0.a
+++ b/linux-x86_64/lib/libglib-2.0.a
Binary files differ
diff --git a/linux-x86_64/lib/libglib-2.0.la b/linux-x86_64/lib/libglib-2.0.la
index 570505d..9b8b3f1 100755
--- a/linux-x86_64/lib/libglib-2.0.la
+++ b/linux-x86_64/lib/libglib-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib -lpthread -lrt'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-linux-x86_64/lib -lpthread -lrt'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-linux-x86_64/lib'
diff --git a/linux-x86_64/lib/libgmodule-2.0.a b/linux-x86_64/lib/libgmodule-2.0.a
index 6c8886f..8629711 100644
--- a/linux-x86_64/lib/libgmodule-2.0.a
+++ b/linux-x86_64/lib/libgmodule-2.0.a
Binary files differ
diff --git a/linux-x86_64/lib/libgmodule-2.0.la b/linux-x86_64/lib/libgmodule-2.0.la
index 44d9d66..a5f7e52 100755
--- a/linux-x86_64/lib/libgmodule-2.0.la
+++ b/linux-x86_64/lib/libgmodule-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib -ldl /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib/libglib-2.0.la -lpthread -lrt'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-linux-x86_64/lib -ldl /tmp/zyy-build-temp-120638/install-linux-x86_64/lib/libglib-2.0.la -lpthread -lrt'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-linux-x86_64/lib'
diff --git a/linux-x86_64/lib/libgobject-2.0.a b/linux-x86_64/lib/libgobject-2.0.a
index 05367f7..fa57e8a 100644
--- a/linux-x86_64/lib/libgobject-2.0.a
+++ b/linux-x86_64/lib/libgobject-2.0.a
Binary files differ
diff --git a/linux-x86_64/lib/libgobject-2.0.la b/linux-x86_64/lib/libgobject-2.0.la
index 9663f12..e7f9ca9 100755
--- a/linux-x86_64/lib/libgobject-2.0.la
+++ b/linux-x86_64/lib/libgobject-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib/libglib-2.0.la -lpthread -lrt /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib/../lib64/libffi.la'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-linux-x86_64/lib /tmp/zyy-build-temp-120638/install-linux-x86_64/lib/libglib-2.0.la -lpthread -lrt /tmp/zyy-build-temp-120638/install-linux-x86_64/lib/../lib64/libffi.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-linux-x86_64/lib'
diff --git a/linux-x86_64/lib/libgthread-2.0.a b/linux-x86_64/lib/libgthread-2.0.a
index 34686cd..ff26c0c 100644
--- a/linux-x86_64/lib/libgthread-2.0.a
+++ b/linux-x86_64/lib/libgthread-2.0.a
Binary files differ
diff --git a/linux-x86_64/lib/libgthread-2.0.la b/linux-x86_64/lib/libgthread-2.0.la
index 1a794e3..bf9b183 100755
--- a/linux-x86_64/lib/libgthread-2.0.la
+++ b/linux-x86_64/lib/libgthread-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib/libglib-2.0.la -lpthread -lrt'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-linux-x86_64/lib /tmp/zyy-build-temp-120638/install-linux-x86_64/lib/libglib-2.0.la -lpthread -lrt'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-linux-x86_64/lib'
diff --git a/linux-x86_64/lib/libpixman-1.a b/linux-x86_64/lib/libpixman-1.a
index 718dcd5..1a01385 100644
--- a/linux-x86_64/lib/libpixman-1.a
+++ b/linux-x86_64/lib/libpixman-1.a
Binary files differ
diff --git a/linux-x86_64/lib/libpixman-1.la b/linux-x86_64/lib/libpixman-1.la
index 467ff64..ae23d9f 100755
--- a/linux-x86_64/lib/libpixman-1.la
+++ b/linux-x86_64/lib/libpixman-1.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib -lm'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-linux-x86_64/lib -lm'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-linux-x86_64/lib'
diff --git a/linux-x86_64/lib/libpng16.a b/linux-x86_64/lib/libpng16.a
index 66bce2c..f9c4b92 100644
--- a/linux-x86_64/lib/libpng16.a
+++ b/linux-x86_64/lib/libpng16.a
Binary files differ
diff --git a/linux-x86_64/lib/libpng16.la b/linux-x86_64/lib/libpng16.la
index 49a6242..f145deb 100755
--- a/linux-x86_64/lib/libpng16.la
+++ b/linux-x86_64/lib/libpng16.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib -lz -lm'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-linux-x86_64/lib -lz -lm'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-linux-x86_64/lib'
diff --git a/linux-x86_64/lib/libz.a b/linux-x86_64/lib/libz.a
index 3694349..3792cc7 100644
--- a/linux-x86_64/lib/libz.a
+++ b/linux-x86_64/lib/libz.a
Binary files differ
diff --git a/linux-x86_64/lib/libz.so b/linux-x86_64/lib/libz.so
index 2bfad1b..628585b 120000
--- a/linux-x86_64/lib/libz.so
+++ b/linux-x86_64/lib/libz.so
@@ -1 +1 @@
-libz.so.1.2.8
\ No newline at end of file
+libz.so.1.2.10
\ No newline at end of file
diff --git a/linux-x86_64/lib/libz.so.1 b/linux-x86_64/lib/libz.so.1
index 2bfad1b..628585b 120000
--- a/linux-x86_64/lib/libz.so.1
+++ b/linux-x86_64/lib/libz.so.1
@@ -1 +1 @@
-libz.so.1.2.8
\ No newline at end of file
+libz.so.1.2.10
\ No newline at end of file
diff --git a/linux-x86_64/lib/libz.so.1.2.10 b/linux-x86_64/lib/libz.so.1.2.10
new file mode 100755
index 0000000..842fb65
--- /dev/null
+++ b/linux-x86_64/lib/libz.so.1.2.10
Binary files differ
diff --git a/linux-x86_64/lib/libz.so.1.2.8 b/linux-x86_64/lib/libz.so.1.2.8
deleted file mode 100755
index 3c1a878..0000000
--- a/linux-x86_64/lib/libz.so.1.2.8
+++ /dev/null
Binary files differ
diff --git a/linux-x86_64/lib/pkgconfig/gio-2.0.pc b/linux-x86_64/lib/pkgconfig/gio-2.0.pc
index 1fbdf62..7ff47f0 100644
--- a/linux-x86_64/lib/pkgconfig/gio-2.0.pc
+++ b/linux-x86_64/lib/pkgconfig/gio-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
@@ -14,5 +14,5 @@
 Requires: glib-2.0 gobject-2.0
 Requires.private: gmodule-no-export-2.0
 Libs: -L${libdir} -lgio-2.0 -ldnsapi -liphlpapi
-Libs.private: -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib -lz   -lresolv 
+Libs.private: -L/tmp/zyy-build-temp-120638/install-linux-x86_64/lib -lz   -lresolv 
 Cflags:
diff --git a/linux-x86_64/lib/pkgconfig/gio-unix-2.0.pc b/linux-x86_64/lib/pkgconfig/gio-unix-2.0.pc
index 6baa85a..03293c9 100644
--- a/linux-x86_64/lib/pkgconfig/gio-unix-2.0.pc
+++ b/linux-x86_64/lib/pkgconfig/gio-unix-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/linux-x86_64/lib/pkgconfig/glib-2.0.pc b/linux-x86_64/lib/pkgconfig/glib-2.0.pc
index 9368044..53ad894 100644
--- a/linux-x86_64/lib/pkgconfig/glib-2.0.pc
+++ b/linux-x86_64/lib/pkgconfig/glib-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/linux-x86_64/lib/pkgconfig/gmodule-2.0.pc b/linux-x86_64/lib/pkgconfig/gmodule-2.0.pc
index 5f6483e..e574c0d 100644
--- a/linux-x86_64/lib/pkgconfig/gmodule-2.0.pc
+++ b/linux-x86_64/lib/pkgconfig/gmodule-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/linux-x86_64/lib/pkgconfig/gmodule-export-2.0.pc b/linux-x86_64/lib/pkgconfig/gmodule-export-2.0.pc
index 5f6483e..e574c0d 100644
--- a/linux-x86_64/lib/pkgconfig/gmodule-export-2.0.pc
+++ b/linux-x86_64/lib/pkgconfig/gmodule-export-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/linux-x86_64/lib/pkgconfig/gmodule-no-export-2.0.pc b/linux-x86_64/lib/pkgconfig/gmodule-no-export-2.0.pc
index 73dde2d..8b45229 100644
--- a/linux-x86_64/lib/pkgconfig/gmodule-no-export-2.0.pc
+++ b/linux-x86_64/lib/pkgconfig/gmodule-no-export-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/linux-x86_64/lib/pkgconfig/gobject-2.0.pc b/linux-x86_64/lib/pkgconfig/gobject-2.0.pc
index a0e304b..9e4b904 100644
--- a/linux-x86_64/lib/pkgconfig/gobject-2.0.pc
+++ b/linux-x86_64/lib/pkgconfig/gobject-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
@@ -8,5 +8,5 @@
 Requires: glib-2.0
 Version: 2.38.2
 Libs: -L${libdir} -lgobject-2.0
-Libs.private: /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib64/libffi.la
+Libs.private: /tmp/zyy-build-temp-120638/install-linux-x86_64/lib64/libffi.la
 Cflags:
diff --git a/linux-x86_64/lib/pkgconfig/gthread-2.0.pc b/linux-x86_64/lib/pkgconfig/gthread-2.0.pc
index 9ba7d18..7299051 100644
--- a/linux-x86_64/lib/pkgconfig/gthread-2.0.pc
+++ b/linux-x86_64/lib/pkgconfig/gthread-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/linux-x86_64/lib/pkgconfig/libffi.pc b/linux-x86_64/lib/pkgconfig/libffi.pc
index a7d8b05..b98b040 100644
--- a/linux-x86_64/lib/pkgconfig/libffi.pc
+++ b/linux-x86_64/lib/pkgconfig/libffi.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 toolexeclibdir=${exec_prefix}/lib/../lib64
diff --git a/linux-x86_64/lib/pkgconfig/libpng16.pc b/linux-x86_64/lib/pkgconfig/libpng16.pc
index 23dd42c..2f46f69 100644
--- a/linux-x86_64/lib/pkgconfig/libpng16.pc
+++ b/linux-x86_64/lib/pkgconfig/libpng16.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include/libpng16
diff --git a/linux-x86_64/lib/pkgconfig/pixman-1.pc b/linux-x86_64/lib/pkgconfig/pixman-1.pc
index 2d8c051..93e3408 100644
--- a/linux-x86_64/lib/pkgconfig/pixman-1.pc
+++ b/linux-x86_64/lib/pkgconfig/pixman-1.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/linux-x86_64/lib/pkgconfig/sdl2.pc b/linux-x86_64/lib/pkgconfig/sdl2.pc
index 0a16886..1070f01 100644
--- a/linux-x86_64/lib/pkgconfig/sdl2.pc
+++ b/linux-x86_64/lib/pkgconfig/sdl2.pc
@@ -1,6 +1,6 @@
 # sdl pkg-config source file
 
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/linux-x86_64/lib/pkgconfig/zlib.pc b/linux-x86_64/lib/pkgconfig/zlib.pc
index cefcdd3..29757e6 100644
--- a/linux-x86_64/lib/pkgconfig/zlib.pc
+++ b/linux-x86_64/lib/pkgconfig/zlib.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-linux-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 sharedlibdir=${libdir}
@@ -6,7 +6,7 @@
 
 Name: zlib
 Description: zlib compression library
-Version: 1.2.8
+Version: 1.2.10
 
 Requires:
 Libs: -L${libdir} -L${sharedlibdir} -lz
diff --git a/linux-x86_64/lib64/libffi.a b/linux-x86_64/lib64/libffi.a
index 0d31c71..714ddd5 100644
--- a/linux-x86_64/lib64/libffi.a
+++ b/linux-x86_64/lib64/libffi.a
Binary files differ
diff --git a/linux-x86_64/lib64/libffi.la b/linux-x86_64/lib64/libffi.la
index 2c9b8fb..1951fe5 100755
--- a/linux-x86_64/lib64/libffi.la
+++ b/linux-x86_64/lib64/libffi.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-linux-x86_64/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-linux-x86_64/lib/../lib64'
+libdir='/tmp/zyy-build-temp-120638/install-linux-x86_64/lib/../lib64'
diff --git a/windows-x86/bin/gdbus-codegen b/windows-x86/bin/gdbus-codegen
index bd1d7df..3bb3147 100755
--- a/windows-x86/bin/gdbus-codegen
+++ b/windows-x86/bin/gdbus-codegen
@@ -33,7 +33,7 @@
     # Makes gdbus-codegen 'relocatable' at runtime on Windows.
     path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
 else:
-    path = os.path.join('/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/share', 'glib-2.0')
+    path = os.path.join('/tmp/zyy-build-temp-120638/install-windows-x86/share', 'glib-2.0')
 
 sys.path.insert(0, os.path.abspath(path))
 from codegen import codegen_main
diff --git a/windows-x86/bin/gspawn-win32-helper-console.exe b/windows-x86/bin/gspawn-win32-helper-console.exe
index 599e4e6..30b38fb 100755
--- a/windows-x86/bin/gspawn-win32-helper-console.exe
+++ b/windows-x86/bin/gspawn-win32-helper-console.exe
Binary files differ
diff --git a/windows-x86/bin/gspawn-win32-helper.exe b/windows-x86/bin/gspawn-win32-helper.exe
index f24fd0a..c2f0e28 100755
--- a/windows-x86/bin/gspawn-win32-helper.exe
+++ b/windows-x86/bin/gspawn-win32-helper.exe
Binary files differ
diff --git a/windows-x86/bin/libpng16-config b/windows-x86/bin/libpng16-config
index 847e098..8d73c83 100755
--- a/windows-x86/bin/libpng16-config
+++ b/windows-x86/bin/libpng16-config
@@ -12,7 +12,7 @@
 # Modeled after libxml-config.
 
 version="1.6.16"
-prefix="/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86"
+prefix="/tmp/zyy-build-temp-120638/install-windows-x86"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"
 includedir="${prefix}/include/libpng16"
diff --git a/windows-x86/bin/pkg-config.exe b/windows-x86/bin/pkg-config.exe
index 4d830c9..1ac865f 100755
--- a/windows-x86/bin/pkg-config.exe
+++ b/windows-x86/bin/pkg-config.exe
Binary files differ
diff --git a/windows-x86/bin/png-fix-itxt.exe b/windows-x86/bin/png-fix-itxt.exe
index 73448ba..dea9f05 100755
--- a/windows-x86/bin/png-fix-itxt.exe
+++ b/windows-x86/bin/png-fix-itxt.exe
Binary files differ
diff --git a/windows-x86/bin/pngfix.exe b/windows-x86/bin/pngfix.exe
index bbc6ecd..d27925a 100755
--- a/windows-x86/bin/pngfix.exe
+++ b/windows-x86/bin/pngfix.exe
Binary files differ
diff --git a/windows-x86/bin/sdl2-config b/windows-x86/bin/sdl2-config
index 941d1f9..97386a0 100755
--- a/windows-x86/bin/sdl2-config
+++ b/windows-x86/bin/sdl2-config
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 exec_prefix_set=no
 libdir=${exec_prefix}/lib
diff --git a/windows-x86/include/libpng16/pnglibconf.h b/windows-x86/include/libpng16/pnglibconf.h
index 42a195b..13a566c 100644
--- a/windows-x86/include/libpng16/pnglibconf.h
+++ b/windows-x86/include/libpng16/pnglibconf.h
@@ -198,7 +198,7 @@
 #define PNG_TEXT_Z_DEFAULT_STRATEGY 0
 #define PNG_WEIGHT_SHIFT 8
 #define PNG_ZBUF_SIZE 8192
-#define PNG_ZLIB_VERNUM 0x1280
+#define PNG_ZLIB_VERNUM 0x12a0
 #define PNG_Z_DEFAULT_COMPRESSION (-1)
 #define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
 #define PNG_Z_DEFAULT_STRATEGY 1
diff --git a/windows-x86/include/zconf.h b/windows-x86/include/zconf.h
index 9987a77..5e1d68a 100644
--- a/windows-x86/include/zconf.h
+++ b/windows-x86/include/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -17,7 +17,7 @@
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
 #  define Z_PREFIX_SET
 
-/* all linked symbols */
+/* all linked symbols and init macros */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
@@ -29,6 +29,7 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
 #  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
@@ -37,10 +38,14 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
 #  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
@@ -67,6 +72,8 @@
 #    define gzeof                 z_gzeof
 #    define gzerror               z_gzerror
 #    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
 #    define gzgetc                z_gzgetc
 #    define gzgetc_               z_gzgetc_
 #    define gzgets                z_gzgets
@@ -78,7 +85,6 @@
 #      define gzopen_w              z_gzopen_w
 #    endif
 #    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
 #    define gzread                z_gzread
@@ -89,32 +95,39 @@
 #    define gztell                z_gztell
 #    define gztell64              z_gztell64
 #    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
 #    define gzwrite               z_gzwrite
 #  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
 #  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
 #  define inflateCopy           z_inflateCopy
 #  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
 #  define inflateInit2_         z_inflateInit2_
 #  define inflateInit_          z_inflateInit_
 #  define inflateMark           z_inflateMark
 #  define inflatePrime          z_inflatePrime
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
 #  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateValidate       z_inflateValidate
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
 #  ifndef Z_SOLO
 #    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
 #  endif
 #  define zError                z_zError
 #  ifndef Z_SOLO
@@ -224,9 +237,19 @@
 #  define z_const
 #endif
 
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
 #endif
 
 /* Maximum value for memLevel in deflateInit2 */
@@ -256,7 +279,7 @@
  Of course this will generally degrade compression (there's no free lunch).
 
    The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
  for small objects.
 */
 
diff --git a/windows-x86/include/zlib.h b/windows-x86/include/zlib.h
index 3e0c767..dc90dc8 100644
--- a/windows-x86/include/zlib.h
+++ b/windows-x86/include/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
+  version 1.2.10, January 2nd, 2017
 
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
+#define ZLIB_VERSION "1.2.10"
+#define ZLIB_VERNUM 0x12a0
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_REVISION 10
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -65,7 +65,8 @@
   with "gz".  The gzip format is different from the zlib format.  gzip is a
   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
 
-    This library can optionally read and write gzip streams in memory as well.
+    This library can optionally read and write gzip and raw deflate streams in
+  memory as well.
 
     The zlib format was designed to be compact and fast for use in memory
   and on communications channels.  The gzip format was designed for single-
@@ -74,7 +75,7 @@
 
     The library does not install any signal handler.  The decoder checks
   the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
+  even in the case of corrupted input.
 */
 
 typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -87,7 +88,7 @@
     uInt     avail_in;  /* number of bytes available at next_in */
     uLong    total_in;  /* total number of input bytes read so far */
 
-    Bytef    *next_out; /* next output byte should be put there */
+    Bytef    *next_out; /* next output byte will go here */
     uInt     avail_out; /* remaining free space at next_out */
     uLong    total_out; /* total number of bytes output so far */
 
@@ -98,8 +99,9 @@
     free_func  zfree;   /* used to free the internal state */
     voidpf     opaque;  /* private data object passed to zalloc and zfree */
 
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
+    int     data_type;  /* best guess about the data type: binary or text
+                           for deflate, or the decoding state for inflate */
+    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
     uLong   reserved;   /* reserved for future use */
 } z_stream;
 
@@ -142,7 +144,9 @@
 
      zalloc must return Z_NULL if there is not enough memory for the object.
    If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
+   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
+   Z_NULL on entry to the initialization function, they are set to internal
+   routines that use the standard library functions malloc() and free().
 
      On 16-bit systems, the functions zalloc and zfree must be able to allocate
    exactly 65536 bytes, but will not be required to allocate more than this if
@@ -155,7 +159,7 @@
 
      The fields total_in and total_out can be used for statistics or progress
    reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
+   uncompressed data and may be saved for use by the decompressor (particularly
    if the decompressor wants to decompress everything in a single step).
 */
 
@@ -200,7 +204,7 @@
 #define Z_TEXT     1
 #define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
 #define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
+/* Possible values of the data_type field for deflate() */
 
 #define Z_DEFLATED   8
 /* The deflate compression method (the only one supported in this version) */
@@ -258,11 +262,11 @@
     enough room in the output buffer), next_in and avail_in are updated and
     processing will resume at this point for the next call of deflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  This action is forced if the parameter flush is non zero.
     Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
+    should be set only when necessary.  Some output may be provided even if
+    flush is zero.
 
     Before the call of deflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
@@ -271,7 +275,9 @@
   output when it wants, for example when the output buffer is full (avail_out
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
+  buffer because there might be more output pending. See deflatePending(),
+  which can be used if desired to determine whether or not there is more ouput
+  in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
   decide how much data to accumulate before producing output, in order to
@@ -292,8 +298,8 @@
   input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
   This completes the current deflate block and follows it with an empty fixed
   codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
+  in order for the decompressor to finish the block before the empty fixed
+  codes block.
 
     If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
   for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
@@ -319,34 +325,38 @@
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
   pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
+  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
+  function must be called again with Z_FINISH and more output space (updated
+  avail_out) but no more input data, until it returns with Z_STREAM_END or an
+  error.  After deflate has returned Z_STREAM_END, the only possible operations
+  on the stream are deflateReset or deflateEnd.
 
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
-  not return Z_STREAM_END, and it must be called again as described above.
+    Z_FINISH can be used in the first deflate call after deflateInit if all the
+  compression is to be done in a single step.  In order to complete in one
+  call, avail_out must be at least the value returned by deflateBound (see
+  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
+  output space is provided, deflate will not return Z_STREAM_END, and it must
+  be called again as described above.
 
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
+    deflate() sets strm->adler to the Adler-32 checksum of all input read
+  so far (that is, total_in bytes).  If a gzip stream is being generated, then
+  strm->adler will be the CRC-32 checksum of the input read so far.  (See
+  deflateInit2 below.)
 
     deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
+  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
+  considered binary.  This field is only for information purposes and does not
+  affect the compression algorithm in any manner.
 
     deflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if all input has been
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
+  if next_in or next_out was Z_NULL or the state was inadvertently written over
+  by the application), or Z_BUF_ERROR if no progress is possible (for example
+  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
+  deflate() can be called again with more input and more output space to
+  continue compressing.
 */
 
 
@@ -369,23 +379,21 @@
 
      Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
+   the caller.  In the current version of inflate, the provided input is not
+   read or consumed.  The allocation of a sliding window will be deferred to
+   the first call of inflate (if the decompression does not complete on the
+   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
+   them to use default allocation functions.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
    version assumed by the caller, or Z_STREAM_ERROR if the parameters are
    invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
+   there is no error message.  inflateInit does not perform any decompression.
+   Actual decompression will be done by inflate().  So next_in, and avail_in,
+   next_out, and avail_out are unused and unchanged.  The current
+   implementation of inflateInit() does not process any header information --
+   that is deferred until inflate() is called.
 */
 
 
@@ -401,17 +409,20 @@
 
   - Decompress more input starting at next_in and update next_in and avail_in
     accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
+    enough room in the output buffer), then next_in and avail_in are updated
+    accordingly, and processing will resume at this point for the next call of
+    inflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  inflate() provides as much output as possible, until there is
     no more input data or no more space in the output buffer (see below about
     the flush parameter).
 
     Before the call of inflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
+  output, and updating the next_* and avail_* values accordingly.  If the
+  caller of inflate() does not provide both available input and available
+  output space, it is possible that there will be no progress made.  The
   application can consume the uncompressed output when it wants, for example
   when the output buffer is full (avail_out == 0), or after each call of
   inflate().  If inflate returns Z_OK and with zero avail_out, it must be
@@ -428,7 +439,7 @@
   gets to the end of that block, or when it runs out of data.
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
+  To assist in this, on return inflate() always sets strm->data_type to the
   number of unused bits in the last byte taken from strm->next_in, plus 64 if
   inflate() is currently decoding the last block in the deflate stream, plus
   128 if inflate() returned immediately after decoding an end-of-block code or
@@ -454,7 +465,7 @@
   this case all pending input is processed and all pending output is flushed;
   avail_out must be large enough to hold all of the uncompressed data for the
   operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  saved by the compressor for this purpose.)  The use of Z_FINISH is not
   required to perform an inflation in one step.  However it may be used to
   inform inflate that a faster approach can be used for the single inflate()
   call.  Z_FINISH also informs inflate to not maintain a sliding window if the
@@ -476,32 +487,33 @@
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
   strm->adler to the Adler-32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
+  below.  At the end of the stream, inflate() checks that its computed Adler-32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
   only if the checksum is correct.
 
     inflate() can decompress and check either zlib-wrapped or gzip-wrapped
   deflate data.  The header type is detected automatically, if requested when
   initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
+  header is not retained unless inflateGetHeader() is used.  When processing
   gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
+  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
+  uncompressed length, modulo 2^32.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
   been reached and all uncompressed output has been produced, Z_NEED_DICT if a
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
   corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  value, in which case strm->msg points to a string with a more specific
+  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  next_in or next_out was Z_NULL, or the state was inadvertently written over
+  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
+  if no progress was possible or if there was not enough room in the output
+  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
   inflate() can be called again with more input and more output space to
   continue decompressing.  If Z_DATA_ERROR is returned, the application may
   then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
+  recovery of the data is to be attempted.
 */
 
 
@@ -511,9 +523,8 @@
    This function discards any unprocessed input and does not flush any pending
    output.
 
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
+     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
+   was inconsistent.
 */
 
 
@@ -544,16 +555,29 @@
    compression at the expense of memory usage.  The default value is 15 if
    deflateInit is used instead.
 
+     For the current implementation of deflate(), a windowBits value of 8 (a
+   window size of 256 bytes) is not supported.  As a result, a request for 8
+   will result in 9 (a 512-byte window).  In that case, providing 8 to
+   inflateInit2() will result in an error when the zlib header with 9 is
+   checked against the initialization of inflate().  The remedy is to not use 8
+   with deflateInit2() with this initialization, or at least in that case use 9
+   with inflateInit2().
+
      windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
    determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
+   with no zlib header or trailer, and will not compute a check value.
 
      windowBits can also be greater than 15 for optional gzip encoding.  Add
    16 to windowBits to write a simple gzip header and trailer around the
    compressed data instead of a zlib wrapper.  The gzip header will have no
    file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+   header crc, and the operating system will be set to the appropriate value,
+   if the operating system was determined at compile time.  If a gzip stream is
+   being written, strm->adler is a CRC-32 instead of an Adler-32.
+
+     For raw deflate or gzip encoding, a request for a 256-byte window is
+   rejected as invalid, since only the zlib header provides a means of
+   transmitting the window size to the decompressor.
 
      The memLevel parameter specifies how much memory should be allocated
    for the internal compression state.  memLevel=1 uses minimum memory but is
@@ -614,12 +638,12 @@
    addition, the current implementation of deflate will use at most the window
    size minus 262 bytes of the provided dictionary.
 
-     Upon return of this function, strm->adler is set to the adler32 value
+     Upon return of this function, strm->adler is set to the Adler-32 value
    of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
+   which dictionary has been used by the compressor.  (The Adler-32 value
    applies to the whole dictionary even if only a subset of the dictionary is
    actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
+   Adler-32 value is not computed and strm->adler is not set.
 
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
@@ -628,6 +652,28 @@
    not perform any compression: this will be done by deflate().
 */
 
+ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by deflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If deflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     deflateGetDictionary() may return a length less than the window size, even
+   when more than the window size in input has been provided. It may return up
+   to 258 bytes less in that case, due to how zlib's implementation of deflate
+   manages the sliding window and lookahead for matches, where matches can be
+   up to 258 bytes long. If the application needs the last window-size bytes of
+   input, then that would need to be saved by the application outside of zlib.
+
+     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
                                     z_streamp source));
 /*
@@ -648,10 +694,10 @@
 
 ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
 /*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
+     This function is equivalent to deflateEnd followed by deflateInit, but
+   does not free and reallocate the internal compression state.  The stream
+   will leave the compression level and any other attributes that may have been
+   set unchanged.
 
      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL).
@@ -662,20 +708,35 @@
                                       int strategy));
 /*
      Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
+   interpretation of level and strategy is as in deflateInit2().  This can be
    used to switch between compression and straight copy of the input data, or
    to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
+   If the compression approach (which is a function of the level) or the
+   strategy is changed, then the input available so far is compressed with the
+   old level and strategy using deflate(strm, Z_BLOCK).  There are three
+   approaches for the compression levels 0, 1..3, and 4..9 respectively.  The
+   new level and strategy will take effect at the next call of deflate().
 
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
+     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
+   not have enough output space to complete, then the parameter change will not
+   take effect.  In this case, deflateParams() can be called again with the
+   same parameters and more output space to try again.
 
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
+     In order to assure a change in the parameters on the first try, the
+   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
+   request until strm.avail_out is not zero, before calling deflateParams().
+   Then no more input data should be provided before the deflateParams() call.
+   If this is done, the old level and strategy will be applied to the data
+   compressed before deflateParams(), and the new level and strategy will be
+   applied to the the data compressed after deflateParams().
+
+     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
+   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
+   there was not enough output space to complete the compression of the
+   available input data before a change in the strategy or approach.  Note that
+   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
+   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
+   retried with more output space.
 */
 
 ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@@ -793,7 +854,7 @@
    is for use with other formats that use the deflate compressed data format
    such as zip.  Those formats provide their own check values.  If a custom
    format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
+   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
    the uncompressed data as is done in the zlib, gzip, and zip formats.  For
    most applications, the zlib format should be used as is.  Note that comments
    above on the use in deflateInit2() applies to the magnitude of windowBits.
@@ -802,7 +863,10 @@
    32 to windowBits to enable zlib and gzip decoding with automatic header
    detection, or add 16 to decode only the gzip format (the zlib format will
    return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
+   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
+   below), inflate() will not automatically decode concatenated gzip streams.
+   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
+   would need to be reset to continue decoding a subsequent gzip stream.
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -823,7 +887,7 @@
      Initializes the decompression dictionary from the given uncompressed byte
    sequence.  This function must be called immediately after a call of inflate,
    if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
+   can be determined from the Adler-32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
    deflateSetDictionary).  For raw inflate, this function can be called at any
    time to set the dictionary.  If the provided dictionary is smaller than the
@@ -834,7 +898,7 @@
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
@@ -892,7 +956,7 @@
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
+   but does not free and reallocate the internal decompression state.  The
    stream will keep attributes that may have been set by inflateInit2.
 
      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
@@ -904,7 +968,9 @@
 /*
      This function is the same as inflateReset, but it also permits changing
    the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
+   the same as it is for inflateInit2.  If the window size is changed, then the
+   memory allocated for the window is freed, and the window will be reallocated
+   by inflate() if needed.
 
      inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL), or if
@@ -956,7 +1022,7 @@
    location in the input stream can be determined from avail_in and data_type
    as noted in the description for the Z_BLOCK flush parameter for inflate.
 
-     inflateMark returns the value noted above or -1 << 16 if the provided
+     inflateMark returns the value noted above, or -65536 if the provided
    source stream state was inconsistent.
 */
 
@@ -1048,9 +1114,9 @@
    This routine would normally be used in a utility that reads zip or gzip
    files and writes out uncompressed files.  The utility would decode the
    header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
+   the raw deflate stream to decompress.  This is different from the default
+   behavior of inflate(), which expects a zlib header and trailer around the
+   deflate stream.
 
      inflateBack() uses two subroutines supplied by the caller that are then
    called by inflateBack() for input and output.  inflateBack() calls those
@@ -1059,12 +1125,12 @@
    parameters and return types are defined above in the in_func and out_func
    typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
    number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
+   there is no input available, in() must return zero -- buf is ignored in that
+   case -- and inflateBack() will return a buffer error.  inflateBack() will
+   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
+   out() should return zero on success, or non-zero on failure.  If out()
+   returns non-zero, inflateBack() will return with an error.  Neither in() nor
+   out() are permitted to change the contents of the window provided to
    inflateBackInit(), which is also the buffer that out() uses to write from.
    The length written by out() will be at most the window size.  Any non-zero
    amount of input may be provided by in().
@@ -1092,7 +1158,7 @@
    using strm->next_in which will be Z_NULL only if in() returned an error.  If
    strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
    non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
+   assured to be defined if out() returns non-zero.)  Note that inflateBack()
    cannot return Z_OK.
 */
 
@@ -1114,7 +1180,7 @@
      7.6: size of z_off_t
 
     Compiler, assembler, and debug options:
-     8: DEBUG
+     8: ZLIB_DEBUG
      9: ASMV or ASMINF -- use ASM code
      10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
      11: 0 (reserved)
@@ -1164,7 +1230,8 @@
    the byte length of the source buffer.  Upon entry, destLen is the total size
    of the destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.  compress() is equivalent to compress2() with a level
+   parameter of Z_DEFAULT_COMPRESSION.
 
      compress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1180,7 +1247,7 @@
    length of the source buffer.  Upon entry, destLen is the total size of the
    destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
@@ -1203,7 +1270,7 @@
    uncompressed data.  (The size of the uncompressed data must have been saved
    previously by the compressor and transmitted to the decompressor by some
    mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
+   is the actual size of the uncompressed data.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1212,6 +1279,14 @@
    buffer with the uncompressed data up to that point.
 */
 
+ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
+                                    const Bytef *source, uLong *sourceLen));
+/*
+     Same as uncompress, except that sourceLen is a pointer, where the
+   length of the source is *sourceLen.  On return, *sourceLen is the number of
+   source bytes consumed.
+*/
+
                         /* gzip file access functions */
 
 /*
@@ -1290,10 +1365,9 @@
    default buffer size is 8192 bytes.  This function must be called after
    gzopen() or gzdopen(), and before any other calls that read or write the
    file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
+   write.  Three times that size in buffer space is allocated.  A larger buffer
+   size of, for example, 64K or 128K bytes will noticeably increase the speed
+   of decompression (reading).
 
      The new buffer size also affects the maximum length for gzprintf().
 
@@ -1304,10 +1378,12 @@
 ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
      Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
+   of deflateInit2 for the meaning of these parameters.  Previously provided
+   data is flushed before the parameter change.
 
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
+     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
+   opened for writing, Z_ERRNO if there is an error writing the flushed data,
+   or Z_MEM_ERROR if there is a memory allocation error.
 */
 
 ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
@@ -1335,7 +1411,35 @@
    case.
 
      gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
+   len for end of file, or -1 for error.  If len is too large to fit in an int,
+   then nothing is read, -1 is returned, and the error state is set to
+   Z_STREAM_ERROR.
+*/
+
+ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
+                                     gzFile file));
+/*
+     Read up to nitems items of size size from file to buf, otherwise operating
+   as gzread() does.  This duplicates the interface of stdio's fread(), with
+   size_t request and return types.  If the library defines size_t, then
+   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
+   integer type that can contain a pointer.
+
+     gzfread() returns the number of full items read of size size, or zero if
+   the end of the file was reached and a full item could not be read, or if
+   there was an error.  gzerror() must be consulted if zero is returned in
+   order to determine if there was an error.  If the multiplication of size and
+   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
+   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
+
+     In the event that the end of file is reached and only a partial item is
+   available at the end, i.e. the remaining uncompressed data length is not a
+   multiple of size, then the final partial item is nevetheless read into buf
+   and the end-of-file flag is set.  The length of the partial item read is not
+   provided, but could be inferred from the result of gztell().  This behavior
+   is the same as the behavior of fread() implementations in common libraries,
+   but it prevents the direct use of gzfread() to read a concurrently written
+   file, reseting and retrying on end-of-file, when size is not 1.
 */
 
 ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
@@ -1346,19 +1450,33 @@
    error.
 */
 
+ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
+                                      z_size_t nitems, gzFile file));
+/*
+     gzfwrite() writes nitems items of size size from buf to file, duplicating
+   the interface of stdio's fwrite(), with size_t request and return types.  If
+   the library defines size_t, then z_size_t is identical to size_t.  If not,
+   then z_size_t is an unsigned integer type that can contain a pointer.
+
+     gzfwrite() returns the number of full items written of size size, or zero
+   if there was an error.  If the multiplication of size and nitems overflows,
+   i.e. the product does not fit in a z_size_t, then nothing is written, zero
+   is returned, and the error state is set to Z_STREAM_ERROR.
+*/
+
 ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
 /*
      Converts, formats, and writes the arguments to the compressed file under
    control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
+   uncompressed bytes actually written, or a negative zlib error code in case
+   of error.  The number of uncompressed bytes written is limited to 8191, or
+   one less than the buffer size given to gzbuffer().  The caller should assure
+   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
+   return an error (0) with nothing written.  In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   because the secure snprintf() or vsnprintf() functions were not available.
+   This can be determined using zlibCompileFlags().
 */
 
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
@@ -1418,7 +1536,7 @@
      If the flush parameter is Z_FINISH, the remaining data is written and the
    gzip stream is completed in the output.  If gzwrite() is called again, a new
    gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
+   concatenated gzip streams.
 
      gzflush should be called only when strictly necessary because it will
    degrade compression if called too often.
@@ -1572,7 +1690,7 @@
    return the updated checksum.  If buf is Z_NULL, this function returns the
    required initial value for the checksum.
 
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
    much faster.
 
    Usage example:
@@ -1585,6 +1703,12 @@
      if (adler != original_adler) error();
 */
 
+ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
+                                    z_size_t len));
+/*
+     Same as adler32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
                                           z_off_t len2));
@@ -1614,6 +1738,12 @@
      if (crc != original_crc) error();
 */
 
+ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
+                                  z_size_t len));
+/*
+     Same as crc32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 
@@ -1644,19 +1774,35 @@
                                          unsigned char FAR *window,
                                          const char *version,
                                          int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
+#ifdef Z_PREFIX_SET
+#  define z_deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define z_inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#else
+#  define deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#endif
 
 #ifndef Z_SOLO
 
@@ -1676,10 +1822,10 @@
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #else
 #  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
@@ -1737,19 +1883,16 @@
 
 #endif /* !Z_SOLO */
 
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
 /* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
 ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                             const char *mode));
 #endif
diff --git a/windows-x86/lib/libSDL2.a b/windows-x86/lib/libSDL2.a
index 9254fb0..079bc1f 100644
--- a/windows-x86/lib/libSDL2.a
+++ b/windows-x86/lib/libSDL2.a
Binary files differ
diff --git a/windows-x86/lib/libSDL2.la b/windows-x86/lib/libSDL2.la
index 4f0fa35..e5fbc6e 100755
--- a/windows-x86/lib/libSDL2.la
+++ b/windows-x86/lib/libSDL2.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86/lib -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86/lib'
diff --git a/windows-x86/lib/libSDL2_test.a b/windows-x86/lib/libSDL2_test.a
index b60607c..ebb7a2c 100644
--- a/windows-x86/lib/libSDL2_test.a
+++ b/windows-x86/lib/libSDL2_test.a
Binary files differ
diff --git a/windows-x86/lib/libSDL2main.a b/windows-x86/lib/libSDL2main.a
index 279799c..211ba06 100644
--- a/windows-x86/lib/libSDL2main.a
+++ b/windows-x86/lib/libSDL2main.a
Binary files differ
diff --git a/windows-x86/lib/libfdt.a b/windows-x86/lib/libfdt.a
index 14aac60..106b96f 100644
--- a/windows-x86/lib/libfdt.a
+++ b/windows-x86/lib/libfdt.a
Binary files differ
diff --git a/windows-x86/lib/libgio-2.0.a b/windows-x86/lib/libgio-2.0.a
index 22c3792..57e4bbe 100644
--- a/windows-x86/lib/libgio-2.0.a
+++ b/windows-x86/lib/libgio-2.0.a
Binary files differ
diff --git a/windows-x86/lib/libgio-2.0.la b/windows-x86/lib/libgio-2.0.la
index aa849ab..5de9630 100755
--- a/windows-x86/lib/libgio-2.0.la
+++ b/windows-x86/lib/libgio-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib32 /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib/libgobject-2.0.la /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib/../lib32/libffi.la /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib/libgmodule-2.0.la /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib/libglib-2.0.la -lole32 -lwinmm -lshlwapi -lws2_32 -ldnsapi -liphlpapi -lz'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86/lib -L/tmp/zyy-build-temp-120638/install-windows-x86/lib32 /tmp/zyy-build-temp-120638/install-windows-x86/lib/libgobject-2.0.la /tmp/zyy-build-temp-120638/install-windows-x86/lib/../lib32/libffi.la /tmp/zyy-build-temp-120638/install-windows-x86/lib/libgmodule-2.0.la /tmp/zyy-build-temp-120638/install-windows-x86/lib/libglib-2.0.la -lole32 -lwinmm -lshlwapi -lws2_32 -ldnsapi -liphlpapi -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86/lib'
diff --git a/windows-x86/lib/libglib-2.0.a b/windows-x86/lib/libglib-2.0.a
index 0871b82..7472ba9 100644
--- a/windows-x86/lib/libglib-2.0.a
+++ b/windows-x86/lib/libglib-2.0.a
Binary files differ
diff --git a/windows-x86/lib/libglib-2.0.la b/windows-x86/lib/libglib-2.0.la
index ba48492..3afcd4f 100755
--- a/windows-x86/lib/libglib-2.0.la
+++ b/windows-x86/lib/libglib-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib32 -lws2_32 -lole32 -lwinmm -lshlwapi'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86/lib -L/tmp/zyy-build-temp-120638/install-windows-x86/lib32 -lws2_32 -lole32 -lwinmm -lshlwapi'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86/lib'
diff --git a/windows-x86/lib/libgmodule-2.0.a b/windows-x86/lib/libgmodule-2.0.a
index 004ea40..fe95091 100644
--- a/windows-x86/lib/libgmodule-2.0.a
+++ b/windows-x86/lib/libgmodule-2.0.a
Binary files differ
diff --git a/windows-x86/lib/libgmodule-2.0.la b/windows-x86/lib/libgmodule-2.0.la
index c49d589..0515929 100755
--- a/windows-x86/lib/libgmodule-2.0.la
+++ b/windows-x86/lib/libgmodule-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib32 /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86/lib -L/tmp/zyy-build-temp-120638/install-windows-x86/lib32 /tmp/zyy-build-temp-120638/install-windows-x86/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86/lib'
diff --git a/windows-x86/lib/libgobject-2.0.a b/windows-x86/lib/libgobject-2.0.a
index f6bcdf9..7acff23 100644
--- a/windows-x86/lib/libgobject-2.0.a
+++ b/windows-x86/lib/libgobject-2.0.a
Binary files differ
diff --git a/windows-x86/lib/libgobject-2.0.la b/windows-x86/lib/libgobject-2.0.la
index caa2b93..b402064 100755
--- a/windows-x86/lib/libgobject-2.0.la
+++ b/windows-x86/lib/libgobject-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib32 /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib/../lib32/libffi.la'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86/lib -L/tmp/zyy-build-temp-120638/install-windows-x86/lib32 /tmp/zyy-build-temp-120638/install-windows-x86/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /tmp/zyy-build-temp-120638/install-windows-x86/lib/../lib32/libffi.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86/lib'
diff --git a/windows-x86/lib/libgthread-2.0.a b/windows-x86/lib/libgthread-2.0.a
index a2784b8..dd7747e 100644
--- a/windows-x86/lib/libgthread-2.0.a
+++ b/windows-x86/lib/libgthread-2.0.a
Binary files differ
diff --git a/windows-x86/lib/libgthread-2.0.la b/windows-x86/lib/libgthread-2.0.la
index 1a4700c..3b2f47d 100755
--- a/windows-x86/lib/libgthread-2.0.la
+++ b/windows-x86/lib/libgthread-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib32 /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86/lib -L/tmp/zyy-build-temp-120638/install-windows-x86/lib32 /tmp/zyy-build-temp-120638/install-windows-x86/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86/lib'
diff --git a/windows-x86/lib/libpixman-1.a b/windows-x86/lib/libpixman-1.a
index f8add43..74df518 100644
--- a/windows-x86/lib/libpixman-1.a
+++ b/windows-x86/lib/libpixman-1.a
Binary files differ
diff --git a/windows-x86/lib/libpixman-1.la b/windows-x86/lib/libpixman-1.la
index fc22ac4..8e70176 100755
--- a/windows-x86/lib/libpixman-1.la
+++ b/windows-x86/lib/libpixman-1.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86/lib'
diff --git a/windows-x86/lib/libpng16.a b/windows-x86/lib/libpng16.a
index a87ef8d..cb5dcc0 100644
--- a/windows-x86/lib/libpng16.a
+++ b/windows-x86/lib/libpng16.a
Binary files differ
diff --git a/windows-x86/lib/libpng16.la b/windows-x86/lib/libpng16.la
index 83649ed..6657f36 100755
--- a/windows-x86/lib/libpng16.la
+++ b/windows-x86/lib/libpng16.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib -lz'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86/lib -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86/lib'
diff --git a/windows-x86/lib/libz.a b/windows-x86/lib/libz.a
index 14ca684..6ce850c 100644
--- a/windows-x86/lib/libz.a
+++ b/windows-x86/lib/libz.a
Binary files differ
diff --git a/windows-x86/lib/pkgconfig/gio-2.0.pc b/windows-x86/lib/pkgconfig/gio-2.0.pc
index bc279c1..32933e4 100644
--- a/windows-x86/lib/pkgconfig/gio-2.0.pc
+++ b/windows-x86/lib/pkgconfig/gio-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
@@ -14,5 +14,5 @@
 Requires: glib-2.0 gobject-2.0
 Requires.private: gmodule-no-export-2.0
 Libs: -L${libdir} -lgio-2.0 -ldnsapi -liphlpapi
-Libs.private: -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib -lz   
+Libs.private: -L/tmp/zyy-build-temp-120638/install-windows-x86/lib -lz   
 Cflags:
diff --git a/windows-x86/lib/pkgconfig/gio-windows-2.0.pc b/windows-x86/lib/pkgconfig/gio-windows-2.0.pc
index 0550f35..739cca7 100644
--- a/windows-x86/lib/pkgconfig/gio-windows-2.0.pc
+++ b/windows-x86/lib/pkgconfig/gio-windows-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86/lib/pkgconfig/glib-2.0.pc b/windows-x86/lib/pkgconfig/glib-2.0.pc
index 1846301..d3641ba 100644
--- a/windows-x86/lib/pkgconfig/glib-2.0.pc
+++ b/windows-x86/lib/pkgconfig/glib-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86/lib/pkgconfig/gmodule-2.0.pc b/windows-x86/lib/pkgconfig/gmodule-2.0.pc
index 35c4e64..9e66545 100644
--- a/windows-x86/lib/pkgconfig/gmodule-2.0.pc
+++ b/windows-x86/lib/pkgconfig/gmodule-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86/lib/pkgconfig/gmodule-export-2.0.pc b/windows-x86/lib/pkgconfig/gmodule-export-2.0.pc
index 35c4e64..9e66545 100644
--- a/windows-x86/lib/pkgconfig/gmodule-export-2.0.pc
+++ b/windows-x86/lib/pkgconfig/gmodule-export-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86/lib/pkgconfig/gmodule-no-export-2.0.pc b/windows-x86/lib/pkgconfig/gmodule-no-export-2.0.pc
index ced621a..107db4e 100644
--- a/windows-x86/lib/pkgconfig/gmodule-no-export-2.0.pc
+++ b/windows-x86/lib/pkgconfig/gmodule-no-export-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86/lib/pkgconfig/gobject-2.0.pc b/windows-x86/lib/pkgconfig/gobject-2.0.pc
index e775da9..4f856e0 100644
--- a/windows-x86/lib/pkgconfig/gobject-2.0.pc
+++ b/windows-x86/lib/pkgconfig/gobject-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
@@ -8,5 +8,5 @@
 Requires: glib-2.0
 Version: 2.38.2
 Libs: -L${libdir} -lgobject-2.0
-Libs.private: /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib32/libffi.la
+Libs.private: /tmp/zyy-build-temp-120638/install-windows-x86/lib32/libffi.la
 Cflags:
diff --git a/windows-x86/lib/pkgconfig/gthread-2.0.pc b/windows-x86/lib/pkgconfig/gthread-2.0.pc
index 044a1a2..fe82db6 100644
--- a/windows-x86/lib/pkgconfig/gthread-2.0.pc
+++ b/windows-x86/lib/pkgconfig/gthread-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86/lib/pkgconfig/libffi.pc b/windows-x86/lib/pkgconfig/libffi.pc
index 1974621..681f12a 100644
--- a/windows-x86/lib/pkgconfig/libffi.pc
+++ b/windows-x86/lib/pkgconfig/libffi.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 toolexeclibdir=${exec_prefix}/lib/../lib32
diff --git a/windows-x86/lib/pkgconfig/libpng16.pc b/windows-x86/lib/pkgconfig/libpng16.pc
index f6804ed..9730d8a 100644
--- a/windows-x86/lib/pkgconfig/libpng16.pc
+++ b/windows-x86/lib/pkgconfig/libpng16.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include/libpng16
diff --git a/windows-x86/lib/pkgconfig/pixman-1.pc b/windows-x86/lib/pkgconfig/pixman-1.pc
index c7d7c14..040f6d1 100644
--- a/windows-x86/lib/pkgconfig/pixman-1.pc
+++ b/windows-x86/lib/pkgconfig/pixman-1.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86/lib/pkgconfig/sdl2.pc b/windows-x86/lib/pkgconfig/sdl2.pc
index 3e9be8e..d4958bc 100644
--- a/windows-x86/lib/pkgconfig/sdl2.pc
+++ b/windows-x86/lib/pkgconfig/sdl2.pc
@@ -1,6 +1,6 @@
 # sdl pkg-config source file
 
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86/lib/pkgconfig/zlib.pc b/windows-x86/lib/pkgconfig/zlib.pc
index a183847..6e209b7 100644
--- a/windows-x86/lib/pkgconfig/zlib.pc
+++ b/windows-x86/lib/pkgconfig/zlib.pc
@@ -1,12 +1,12 @@
 prefix=/usr/local
 exec_prefix=/usr/local
-libdir=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib
-sharedlibdir=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib
-includedir=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/include
+libdir=/tmp/zyy-build-temp-120638/install-windows-x86/lib
+sharedlibdir=/tmp/zyy-build-temp-120638/install-windows-x86/lib
+includedir=/tmp/zyy-build-temp-120638/install-windows-x86/include
 
 Name: zlib
 Description: zlib compression library
-Version: 1.2.8
+Version: 1.2.10
 
 Requires:
 Libs: -L${libdir} -L${sharedlibdir} -lz
diff --git a/windows-x86/lib32/libffi.a b/windows-x86/lib32/libffi.a
index 03863ae..7a0ce1c 100644
--- a/windows-x86/lib32/libffi.a
+++ b/windows-x86/lib32/libffi.a
Binary files differ
diff --git a/windows-x86/lib32/libffi.la b/windows-x86/lib32/libffi.la
index 1455143..17deb33 100755
--- a/windows-x86/lib32/libffi.la
+++ b/windows-x86/lib32/libffi.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86/lib/../lib32'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86/lib/../lib32'
diff --git a/windows-x86_64/bin/gdbus-codegen b/windows-x86_64/bin/gdbus-codegen
index 9db7bd0..6e3c1ad 100755
--- a/windows-x86_64/bin/gdbus-codegen
+++ b/windows-x86_64/bin/gdbus-codegen
@@ -33,7 +33,7 @@
     # Makes gdbus-codegen 'relocatable' at runtime on Windows.
     path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
 else:
-    path = os.path.join('/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/share', 'glib-2.0')
+    path = os.path.join('/tmp/zyy-build-temp-120638/install-windows-x86_64/share', 'glib-2.0')
 
 sys.path.insert(0, os.path.abspath(path))
 from codegen import codegen_main
diff --git a/windows-x86_64/bin/gspawn-win64-helper-console.exe b/windows-x86_64/bin/gspawn-win64-helper-console.exe
index 4a8609e..f856a20 100755
--- a/windows-x86_64/bin/gspawn-win64-helper-console.exe
+++ b/windows-x86_64/bin/gspawn-win64-helper-console.exe
Binary files differ
diff --git a/windows-x86_64/bin/gspawn-win64-helper.exe b/windows-x86_64/bin/gspawn-win64-helper.exe
index bb99cba..f9c7d01 100755
--- a/windows-x86_64/bin/gspawn-win64-helper.exe
+++ b/windows-x86_64/bin/gspawn-win64-helper.exe
Binary files differ
diff --git a/windows-x86_64/bin/libpng16-config b/windows-x86_64/bin/libpng16-config
index b5adabb..34c6cbb 100755
--- a/windows-x86_64/bin/libpng16-config
+++ b/windows-x86_64/bin/libpng16-config
@@ -12,7 +12,7 @@
 # Modeled after libxml-config.
 
 version="1.6.16"
-prefix="/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64"
+prefix="/tmp/zyy-build-temp-120638/install-windows-x86_64"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"
 includedir="${prefix}/include/libpng16"
diff --git a/windows-x86_64/bin/pkg-config.exe b/windows-x86_64/bin/pkg-config.exe
index f9740a4..7bac5bc 100755
--- a/windows-x86_64/bin/pkg-config.exe
+++ b/windows-x86_64/bin/pkg-config.exe
Binary files differ
diff --git a/windows-x86_64/bin/png-fix-itxt.exe b/windows-x86_64/bin/png-fix-itxt.exe
index 9c5e1ca..274688a 100755
--- a/windows-x86_64/bin/png-fix-itxt.exe
+++ b/windows-x86_64/bin/png-fix-itxt.exe
Binary files differ
diff --git a/windows-x86_64/bin/pngfix.exe b/windows-x86_64/bin/pngfix.exe
index ecc0f4b..118bdd6 100755
--- a/windows-x86_64/bin/pngfix.exe
+++ b/windows-x86_64/bin/pngfix.exe
Binary files differ
diff --git a/windows-x86_64/bin/sdl2-config b/windows-x86_64/bin/sdl2-config
index 3b1ed3f..fd7d5cc 100755
--- a/windows-x86_64/bin/sdl2-config
+++ b/windows-x86_64/bin/sdl2-config
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 exec_prefix_set=no
 libdir=${exec_prefix}/lib
diff --git a/windows-x86_64/include/libpng16/pnglibconf.h b/windows-x86_64/include/libpng16/pnglibconf.h
index 42a195b..13a566c 100644
--- a/windows-x86_64/include/libpng16/pnglibconf.h
+++ b/windows-x86_64/include/libpng16/pnglibconf.h
@@ -198,7 +198,7 @@
 #define PNG_TEXT_Z_DEFAULT_STRATEGY 0
 #define PNG_WEIGHT_SHIFT 8
 #define PNG_ZBUF_SIZE 8192
-#define PNG_ZLIB_VERNUM 0x1280
+#define PNG_ZLIB_VERNUM 0x12a0
 #define PNG_Z_DEFAULT_COMPRESSION (-1)
 #define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
 #define PNG_Z_DEFAULT_STRATEGY 1
diff --git a/windows-x86_64/include/zconf.h b/windows-x86_64/include/zconf.h
index 9987a77..5e1d68a 100644
--- a/windows-x86_64/include/zconf.h
+++ b/windows-x86_64/include/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -17,7 +17,7 @@
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
 #  define Z_PREFIX_SET
 
-/* all linked symbols */
+/* all linked symbols and init macros */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
@@ -29,6 +29,7 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
 #  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
@@ -37,10 +38,14 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
 #  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
@@ -67,6 +72,8 @@
 #    define gzeof                 z_gzeof
 #    define gzerror               z_gzerror
 #    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
 #    define gzgetc                z_gzgetc
 #    define gzgetc_               z_gzgetc_
 #    define gzgets                z_gzgets
@@ -78,7 +85,6 @@
 #      define gzopen_w              z_gzopen_w
 #    endif
 #    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
 #    define gzread                z_gzread
@@ -89,32 +95,39 @@
 #    define gztell                z_gztell
 #    define gztell64              z_gztell64
 #    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
 #    define gzwrite               z_gzwrite
 #  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
 #  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
 #  define inflateCopy           z_inflateCopy
 #  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
 #  define inflateInit2_         z_inflateInit2_
 #  define inflateInit_          z_inflateInit_
 #  define inflateMark           z_inflateMark
 #  define inflatePrime          z_inflatePrime
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
 #  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateValidate       z_inflateValidate
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
 #  ifndef Z_SOLO
 #    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
 #  endif
 #  define zError                z_zError
 #  ifndef Z_SOLO
@@ -224,9 +237,19 @@
 #  define z_const
 #endif
 
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
 #endif
 
 /* Maximum value for memLevel in deflateInit2 */
@@ -256,7 +279,7 @@
  Of course this will generally degrade compression (there's no free lunch).
 
    The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
  for small objects.
 */
 
diff --git a/windows-x86_64/include/zlib.h b/windows-x86_64/include/zlib.h
index 3e0c767..dc90dc8 100644
--- a/windows-x86_64/include/zlib.h
+++ b/windows-x86_64/include/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
+  version 1.2.10, January 2nd, 2017
 
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
+#define ZLIB_VERSION "1.2.10"
+#define ZLIB_VERNUM 0x12a0
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_REVISION 10
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -65,7 +65,8 @@
   with "gz".  The gzip format is different from the zlib format.  gzip is a
   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
 
-    This library can optionally read and write gzip streams in memory as well.
+    This library can optionally read and write gzip and raw deflate streams in
+  memory as well.
 
     The zlib format was designed to be compact and fast for use in memory
   and on communications channels.  The gzip format was designed for single-
@@ -74,7 +75,7 @@
 
     The library does not install any signal handler.  The decoder checks
   the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
+  even in the case of corrupted input.
 */
 
 typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -87,7 +88,7 @@
     uInt     avail_in;  /* number of bytes available at next_in */
     uLong    total_in;  /* total number of input bytes read so far */
 
-    Bytef    *next_out; /* next output byte should be put there */
+    Bytef    *next_out; /* next output byte will go here */
     uInt     avail_out; /* remaining free space at next_out */
     uLong    total_out; /* total number of bytes output so far */
 
@@ -98,8 +99,9 @@
     free_func  zfree;   /* used to free the internal state */
     voidpf     opaque;  /* private data object passed to zalloc and zfree */
 
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
+    int     data_type;  /* best guess about the data type: binary or text
+                           for deflate, or the decoding state for inflate */
+    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
     uLong   reserved;   /* reserved for future use */
 } z_stream;
 
@@ -142,7 +144,9 @@
 
      zalloc must return Z_NULL if there is not enough memory for the object.
    If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
+   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
+   Z_NULL on entry to the initialization function, they are set to internal
+   routines that use the standard library functions malloc() and free().
 
      On 16-bit systems, the functions zalloc and zfree must be able to allocate
    exactly 65536 bytes, but will not be required to allocate more than this if
@@ -155,7 +159,7 @@
 
      The fields total_in and total_out can be used for statistics or progress
    reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
+   uncompressed data and may be saved for use by the decompressor (particularly
    if the decompressor wants to decompress everything in a single step).
 */
 
@@ -200,7 +204,7 @@
 #define Z_TEXT     1
 #define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
 #define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
+/* Possible values of the data_type field for deflate() */
 
 #define Z_DEFLATED   8
 /* The deflate compression method (the only one supported in this version) */
@@ -258,11 +262,11 @@
     enough room in the output buffer), next_in and avail_in are updated and
     processing will resume at this point for the next call of deflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  This action is forced if the parameter flush is non zero.
     Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
+    should be set only when necessary.  Some output may be provided even if
+    flush is zero.
 
     Before the call of deflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
@@ -271,7 +275,9 @@
   output when it wants, for example when the output buffer is full (avail_out
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
+  buffer because there might be more output pending. See deflatePending(),
+  which can be used if desired to determine whether or not there is more ouput
+  in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
   decide how much data to accumulate before producing output, in order to
@@ -292,8 +298,8 @@
   input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
   This completes the current deflate block and follows it with an empty fixed
   codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
+  in order for the decompressor to finish the block before the empty fixed
+  codes block.
 
     If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
   for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
@@ -319,34 +325,38 @@
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
   pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
+  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
+  function must be called again with Z_FINISH and more output space (updated
+  avail_out) but no more input data, until it returns with Z_STREAM_END or an
+  error.  After deflate has returned Z_STREAM_END, the only possible operations
+  on the stream are deflateReset or deflateEnd.
 
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
-  not return Z_STREAM_END, and it must be called again as described above.
+    Z_FINISH can be used in the first deflate call after deflateInit if all the
+  compression is to be done in a single step.  In order to complete in one
+  call, avail_out must be at least the value returned by deflateBound (see
+  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
+  output space is provided, deflate will not return Z_STREAM_END, and it must
+  be called again as described above.
 
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
+    deflate() sets strm->adler to the Adler-32 checksum of all input read
+  so far (that is, total_in bytes).  If a gzip stream is being generated, then
+  strm->adler will be the CRC-32 checksum of the input read so far.  (See
+  deflateInit2 below.)
 
     deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
+  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
+  considered binary.  This field is only for information purposes and does not
+  affect the compression algorithm in any manner.
 
     deflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if all input has been
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
+  if next_in or next_out was Z_NULL or the state was inadvertently written over
+  by the application), or Z_BUF_ERROR if no progress is possible (for example
+  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
+  deflate() can be called again with more input and more output space to
+  continue compressing.
 */
 
 
@@ -369,23 +379,21 @@
 
      Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
+   the caller.  In the current version of inflate, the provided input is not
+   read or consumed.  The allocation of a sliding window will be deferred to
+   the first call of inflate (if the decompression does not complete on the
+   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
+   them to use default allocation functions.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
    version assumed by the caller, or Z_STREAM_ERROR if the parameters are
    invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
+   there is no error message.  inflateInit does not perform any decompression.
+   Actual decompression will be done by inflate().  So next_in, and avail_in,
+   next_out, and avail_out are unused and unchanged.  The current
+   implementation of inflateInit() does not process any header information --
+   that is deferred until inflate() is called.
 */
 
 
@@ -401,17 +409,20 @@
 
   - Decompress more input starting at next_in and update next_in and avail_in
     accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
+    enough room in the output buffer), then next_in and avail_in are updated
+    accordingly, and processing will resume at this point for the next call of
+    inflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  inflate() provides as much output as possible, until there is
     no more input data or no more space in the output buffer (see below about
     the flush parameter).
 
     Before the call of inflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
+  output, and updating the next_* and avail_* values accordingly.  If the
+  caller of inflate() does not provide both available input and available
+  output space, it is possible that there will be no progress made.  The
   application can consume the uncompressed output when it wants, for example
   when the output buffer is full (avail_out == 0), or after each call of
   inflate().  If inflate returns Z_OK and with zero avail_out, it must be
@@ -428,7 +439,7 @@
   gets to the end of that block, or when it runs out of data.
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
+  To assist in this, on return inflate() always sets strm->data_type to the
   number of unused bits in the last byte taken from strm->next_in, plus 64 if
   inflate() is currently decoding the last block in the deflate stream, plus
   128 if inflate() returned immediately after decoding an end-of-block code or
@@ -454,7 +465,7 @@
   this case all pending input is processed and all pending output is flushed;
   avail_out must be large enough to hold all of the uncompressed data for the
   operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  saved by the compressor for this purpose.)  The use of Z_FINISH is not
   required to perform an inflation in one step.  However it may be used to
   inform inflate that a faster approach can be used for the single inflate()
   call.  Z_FINISH also informs inflate to not maintain a sliding window if the
@@ -476,32 +487,33 @@
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
   strm->adler to the Adler-32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
+  below.  At the end of the stream, inflate() checks that its computed Adler-32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
   only if the checksum is correct.
 
     inflate() can decompress and check either zlib-wrapped or gzip-wrapped
   deflate data.  The header type is detected automatically, if requested when
   initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
+  header is not retained unless inflateGetHeader() is used.  When processing
   gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
+  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
+  uncompressed length, modulo 2^32.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
   been reached and all uncompressed output has been produced, Z_NEED_DICT if a
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
   corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  value, in which case strm->msg points to a string with a more specific
+  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  next_in or next_out was Z_NULL, or the state was inadvertently written over
+  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
+  if no progress was possible or if there was not enough room in the output
+  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
   inflate() can be called again with more input and more output space to
   continue decompressing.  If Z_DATA_ERROR is returned, the application may
   then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
+  recovery of the data is to be attempted.
 */
 
 
@@ -511,9 +523,8 @@
    This function discards any unprocessed input and does not flush any pending
    output.
 
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
+     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
+   was inconsistent.
 */
 
 
@@ -544,16 +555,29 @@
    compression at the expense of memory usage.  The default value is 15 if
    deflateInit is used instead.
 
+     For the current implementation of deflate(), a windowBits value of 8 (a
+   window size of 256 bytes) is not supported.  As a result, a request for 8
+   will result in 9 (a 512-byte window).  In that case, providing 8 to
+   inflateInit2() will result in an error when the zlib header with 9 is
+   checked against the initialization of inflate().  The remedy is to not use 8
+   with deflateInit2() with this initialization, or at least in that case use 9
+   with inflateInit2().
+
      windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
    determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
+   with no zlib header or trailer, and will not compute a check value.
 
      windowBits can also be greater than 15 for optional gzip encoding.  Add
    16 to windowBits to write a simple gzip header and trailer around the
    compressed data instead of a zlib wrapper.  The gzip header will have no
    file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+   header crc, and the operating system will be set to the appropriate value,
+   if the operating system was determined at compile time.  If a gzip stream is
+   being written, strm->adler is a CRC-32 instead of an Adler-32.
+
+     For raw deflate or gzip encoding, a request for a 256-byte window is
+   rejected as invalid, since only the zlib header provides a means of
+   transmitting the window size to the decompressor.
 
      The memLevel parameter specifies how much memory should be allocated
    for the internal compression state.  memLevel=1 uses minimum memory but is
@@ -614,12 +638,12 @@
    addition, the current implementation of deflate will use at most the window
    size minus 262 bytes of the provided dictionary.
 
-     Upon return of this function, strm->adler is set to the adler32 value
+     Upon return of this function, strm->adler is set to the Adler-32 value
    of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
+   which dictionary has been used by the compressor.  (The Adler-32 value
    applies to the whole dictionary even if only a subset of the dictionary is
    actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
+   Adler-32 value is not computed and strm->adler is not set.
 
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
@@ -628,6 +652,28 @@
    not perform any compression: this will be done by deflate().
 */
 
+ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by deflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If deflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     deflateGetDictionary() may return a length less than the window size, even
+   when more than the window size in input has been provided. It may return up
+   to 258 bytes less in that case, due to how zlib's implementation of deflate
+   manages the sliding window and lookahead for matches, where matches can be
+   up to 258 bytes long. If the application needs the last window-size bytes of
+   input, then that would need to be saved by the application outside of zlib.
+
+     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
                                     z_streamp source));
 /*
@@ -648,10 +694,10 @@
 
 ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
 /*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
+     This function is equivalent to deflateEnd followed by deflateInit, but
+   does not free and reallocate the internal compression state.  The stream
+   will leave the compression level and any other attributes that may have been
+   set unchanged.
 
      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL).
@@ -662,20 +708,35 @@
                                       int strategy));
 /*
      Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
+   interpretation of level and strategy is as in deflateInit2().  This can be
    used to switch between compression and straight copy of the input data, or
    to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
+   If the compression approach (which is a function of the level) or the
+   strategy is changed, then the input available so far is compressed with the
+   old level and strategy using deflate(strm, Z_BLOCK).  There are three
+   approaches for the compression levels 0, 1..3, and 4..9 respectively.  The
+   new level and strategy will take effect at the next call of deflate().
 
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
+     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
+   not have enough output space to complete, then the parameter change will not
+   take effect.  In this case, deflateParams() can be called again with the
+   same parameters and more output space to try again.
 
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
+     In order to assure a change in the parameters on the first try, the
+   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
+   request until strm.avail_out is not zero, before calling deflateParams().
+   Then no more input data should be provided before the deflateParams() call.
+   If this is done, the old level and strategy will be applied to the data
+   compressed before deflateParams(), and the new level and strategy will be
+   applied to the the data compressed after deflateParams().
+
+     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
+   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
+   there was not enough output space to complete the compression of the
+   available input data before a change in the strategy or approach.  Note that
+   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
+   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
+   retried with more output space.
 */
 
 ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@@ -793,7 +854,7 @@
    is for use with other formats that use the deflate compressed data format
    such as zip.  Those formats provide their own check values.  If a custom
    format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
+   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
    the uncompressed data as is done in the zlib, gzip, and zip formats.  For
    most applications, the zlib format should be used as is.  Note that comments
    above on the use in deflateInit2() applies to the magnitude of windowBits.
@@ -802,7 +863,10 @@
    32 to windowBits to enable zlib and gzip decoding with automatic header
    detection, or add 16 to decode only the gzip format (the zlib format will
    return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
+   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
+   below), inflate() will not automatically decode concatenated gzip streams.
+   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
+   would need to be reset to continue decoding a subsequent gzip stream.
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -823,7 +887,7 @@
      Initializes the decompression dictionary from the given uncompressed byte
    sequence.  This function must be called immediately after a call of inflate,
    if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
+   can be determined from the Adler-32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
    deflateSetDictionary).  For raw inflate, this function can be called at any
    time to set the dictionary.  If the provided dictionary is smaller than the
@@ -834,7 +898,7 @@
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
@@ -892,7 +956,7 @@
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
+   but does not free and reallocate the internal decompression state.  The
    stream will keep attributes that may have been set by inflateInit2.
 
      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
@@ -904,7 +968,9 @@
 /*
      This function is the same as inflateReset, but it also permits changing
    the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
+   the same as it is for inflateInit2.  If the window size is changed, then the
+   memory allocated for the window is freed, and the window will be reallocated
+   by inflate() if needed.
 
      inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL), or if
@@ -956,7 +1022,7 @@
    location in the input stream can be determined from avail_in and data_type
    as noted in the description for the Z_BLOCK flush parameter for inflate.
 
-     inflateMark returns the value noted above or -1 << 16 if the provided
+     inflateMark returns the value noted above, or -65536 if the provided
    source stream state was inconsistent.
 */
 
@@ -1048,9 +1114,9 @@
    This routine would normally be used in a utility that reads zip or gzip
    files and writes out uncompressed files.  The utility would decode the
    header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
+   the raw deflate stream to decompress.  This is different from the default
+   behavior of inflate(), which expects a zlib header and trailer around the
+   deflate stream.
 
      inflateBack() uses two subroutines supplied by the caller that are then
    called by inflateBack() for input and output.  inflateBack() calls those
@@ -1059,12 +1125,12 @@
    parameters and return types are defined above in the in_func and out_func
    typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
    number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
+   there is no input available, in() must return zero -- buf is ignored in that
+   case -- and inflateBack() will return a buffer error.  inflateBack() will
+   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
+   out() should return zero on success, or non-zero on failure.  If out()
+   returns non-zero, inflateBack() will return with an error.  Neither in() nor
+   out() are permitted to change the contents of the window provided to
    inflateBackInit(), which is also the buffer that out() uses to write from.
    The length written by out() will be at most the window size.  Any non-zero
    amount of input may be provided by in().
@@ -1092,7 +1158,7 @@
    using strm->next_in which will be Z_NULL only if in() returned an error.  If
    strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
    non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
+   assured to be defined if out() returns non-zero.)  Note that inflateBack()
    cannot return Z_OK.
 */
 
@@ -1114,7 +1180,7 @@
      7.6: size of z_off_t
 
     Compiler, assembler, and debug options:
-     8: DEBUG
+     8: ZLIB_DEBUG
      9: ASMV or ASMINF -- use ASM code
      10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
      11: 0 (reserved)
@@ -1164,7 +1230,8 @@
    the byte length of the source buffer.  Upon entry, destLen is the total size
    of the destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.  compress() is equivalent to compress2() with a level
+   parameter of Z_DEFAULT_COMPRESSION.
 
      compress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1180,7 +1247,7 @@
    length of the source buffer.  Upon entry, destLen is the total size of the
    destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
@@ -1203,7 +1270,7 @@
    uncompressed data.  (The size of the uncompressed data must have been saved
    previously by the compressor and transmitted to the decompressor by some
    mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
+   is the actual size of the uncompressed data.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1212,6 +1279,14 @@
    buffer with the uncompressed data up to that point.
 */
 
+ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
+                                    const Bytef *source, uLong *sourceLen));
+/*
+     Same as uncompress, except that sourceLen is a pointer, where the
+   length of the source is *sourceLen.  On return, *sourceLen is the number of
+   source bytes consumed.
+*/
+
                         /* gzip file access functions */
 
 /*
@@ -1290,10 +1365,9 @@
    default buffer size is 8192 bytes.  This function must be called after
    gzopen() or gzdopen(), and before any other calls that read or write the
    file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
+   write.  Three times that size in buffer space is allocated.  A larger buffer
+   size of, for example, 64K or 128K bytes will noticeably increase the speed
+   of decompression (reading).
 
      The new buffer size also affects the maximum length for gzprintf().
 
@@ -1304,10 +1378,12 @@
 ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
      Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
+   of deflateInit2 for the meaning of these parameters.  Previously provided
+   data is flushed before the parameter change.
 
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
+     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
+   opened for writing, Z_ERRNO if there is an error writing the flushed data,
+   or Z_MEM_ERROR if there is a memory allocation error.
 */
 
 ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
@@ -1335,7 +1411,35 @@
    case.
 
      gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
+   len for end of file, or -1 for error.  If len is too large to fit in an int,
+   then nothing is read, -1 is returned, and the error state is set to
+   Z_STREAM_ERROR.
+*/
+
+ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
+                                     gzFile file));
+/*
+     Read up to nitems items of size size from file to buf, otherwise operating
+   as gzread() does.  This duplicates the interface of stdio's fread(), with
+   size_t request and return types.  If the library defines size_t, then
+   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
+   integer type that can contain a pointer.
+
+     gzfread() returns the number of full items read of size size, or zero if
+   the end of the file was reached and a full item could not be read, or if
+   there was an error.  gzerror() must be consulted if zero is returned in
+   order to determine if there was an error.  If the multiplication of size and
+   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
+   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
+
+     In the event that the end of file is reached and only a partial item is
+   available at the end, i.e. the remaining uncompressed data length is not a
+   multiple of size, then the final partial item is nevetheless read into buf
+   and the end-of-file flag is set.  The length of the partial item read is not
+   provided, but could be inferred from the result of gztell().  This behavior
+   is the same as the behavior of fread() implementations in common libraries,
+   but it prevents the direct use of gzfread() to read a concurrently written
+   file, reseting and retrying on end-of-file, when size is not 1.
 */
 
 ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
@@ -1346,19 +1450,33 @@
    error.
 */
 
+ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
+                                      z_size_t nitems, gzFile file));
+/*
+     gzfwrite() writes nitems items of size size from buf to file, duplicating
+   the interface of stdio's fwrite(), with size_t request and return types.  If
+   the library defines size_t, then z_size_t is identical to size_t.  If not,
+   then z_size_t is an unsigned integer type that can contain a pointer.
+
+     gzfwrite() returns the number of full items written of size size, or zero
+   if there was an error.  If the multiplication of size and nitems overflows,
+   i.e. the product does not fit in a z_size_t, then nothing is written, zero
+   is returned, and the error state is set to Z_STREAM_ERROR.
+*/
+
 ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
 /*
      Converts, formats, and writes the arguments to the compressed file under
    control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
+   uncompressed bytes actually written, or a negative zlib error code in case
+   of error.  The number of uncompressed bytes written is limited to 8191, or
+   one less than the buffer size given to gzbuffer().  The caller should assure
+   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
+   return an error (0) with nothing written.  In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   because the secure snprintf() or vsnprintf() functions were not available.
+   This can be determined using zlibCompileFlags().
 */
 
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
@@ -1418,7 +1536,7 @@
      If the flush parameter is Z_FINISH, the remaining data is written and the
    gzip stream is completed in the output.  If gzwrite() is called again, a new
    gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
+   concatenated gzip streams.
 
      gzflush should be called only when strictly necessary because it will
    degrade compression if called too often.
@@ -1572,7 +1690,7 @@
    return the updated checksum.  If buf is Z_NULL, this function returns the
    required initial value for the checksum.
 
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
    much faster.
 
    Usage example:
@@ -1585,6 +1703,12 @@
      if (adler != original_adler) error();
 */
 
+ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
+                                    z_size_t len));
+/*
+     Same as adler32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
                                           z_off_t len2));
@@ -1614,6 +1738,12 @@
      if (crc != original_crc) error();
 */
 
+ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
+                                  z_size_t len));
+/*
+     Same as crc32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 
@@ -1644,19 +1774,35 @@
                                          unsigned char FAR *window,
                                          const char *version,
                                          int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
+#ifdef Z_PREFIX_SET
+#  define z_deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define z_inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#else
+#  define deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#endif
 
 #ifndef Z_SOLO
 
@@ -1676,10 +1822,10 @@
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #else
 #  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
@@ -1737,19 +1883,16 @@
 
 #endif /* !Z_SOLO */
 
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
 /* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
 ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                             const char *mode));
 #endif
diff --git a/windows-x86_64/lib/libSDL2.a b/windows-x86_64/lib/libSDL2.a
index 3a39715..732e7ef 100644
--- a/windows-x86_64/lib/libSDL2.a
+++ b/windows-x86_64/lib/libSDL2.a
Binary files differ
diff --git a/windows-x86_64/lib/libSDL2.la b/windows-x86_64/lib/libSDL2.la
index ba30171..c9a3fce 100755
--- a/windows-x86_64/lib/libSDL2.la
+++ b/windows-x86_64/lib/libSDL2.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86_64/lib'
diff --git a/windows-x86_64/lib/libSDL2_test.a b/windows-x86_64/lib/libSDL2_test.a
index 7d19e6f..9a84f1d 100644
--- a/windows-x86_64/lib/libSDL2_test.a
+++ b/windows-x86_64/lib/libSDL2_test.a
Binary files differ
diff --git a/windows-x86_64/lib/libSDL2main.a b/windows-x86_64/lib/libSDL2main.a
index 04c9527..f14010c 100644
--- a/windows-x86_64/lib/libSDL2main.a
+++ b/windows-x86_64/lib/libSDL2main.a
Binary files differ
diff --git a/windows-x86_64/lib/libfdt.a b/windows-x86_64/lib/libfdt.a
index 9c1ec7d..ad277a7 100644
--- a/windows-x86_64/lib/libfdt.a
+++ b/windows-x86_64/lib/libfdt.a
Binary files differ
diff --git a/windows-x86_64/lib/libffi.a b/windows-x86_64/lib/libffi.a
index af62521..aa5e1c0 100644
--- a/windows-x86_64/lib/libffi.a
+++ b/windows-x86_64/lib/libffi.a
Binary files differ
diff --git a/windows-x86_64/lib/libffi.la b/windows-x86_64/lib/libffi.la
index 4e0c5f3..699ce5c 100755
--- a/windows-x86_64/lib/libffi.la
+++ b/windows-x86_64/lib/libffi.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib/../lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86_64/lib/../lib'
diff --git a/windows-x86_64/lib/libgio-2.0.a b/windows-x86_64/lib/libgio-2.0.a
index 68032ee..e648b79 100644
--- a/windows-x86_64/lib/libgio-2.0.a
+++ b/windows-x86_64/lib/libgio-2.0.a
Binary files differ
diff --git a/windows-x86_64/lib/libgio-2.0.la b/windows-x86_64/lib/libgio-2.0.la
index 437a930..c04c170 100755
--- a/windows-x86_64/lib/libgio-2.0.la
+++ b/windows-x86_64/lib/libgio-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib64 /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib/libgobject-2.0.la /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib/../lib/libffi.la /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib/libgmodule-2.0.la /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib/libglib-2.0.la -lole32 -lwinmm -lshlwapi -lws2_32 -ldnsapi -liphlpapi -lz'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib64 /tmp/zyy-build-temp-120638/install-windows-x86_64/lib/libgobject-2.0.la /tmp/zyy-build-temp-120638/install-windows-x86_64/lib/../lib/libffi.la /tmp/zyy-build-temp-120638/install-windows-x86_64/lib/libgmodule-2.0.la /tmp/zyy-build-temp-120638/install-windows-x86_64/lib/libglib-2.0.la -lole32 -lwinmm -lshlwapi -lws2_32 -ldnsapi -liphlpapi -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86_64/lib'
diff --git a/windows-x86_64/lib/libglib-2.0.a b/windows-x86_64/lib/libglib-2.0.a
index 65d8f73..dde03e0 100644
--- a/windows-x86_64/lib/libglib-2.0.a
+++ b/windows-x86_64/lib/libglib-2.0.a
Binary files differ
diff --git a/windows-x86_64/lib/libglib-2.0.la b/windows-x86_64/lib/libglib-2.0.la
index 90b1ff7..781d82b 100755
--- a/windows-x86_64/lib/libglib-2.0.la
+++ b/windows-x86_64/lib/libglib-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib64 -lws2_32 -lole32 -lwinmm -lshlwapi'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib64 -lws2_32 -lole32 -lwinmm -lshlwapi'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86_64/lib'
diff --git a/windows-x86_64/lib/libgmodule-2.0.a b/windows-x86_64/lib/libgmodule-2.0.a
index ef4d7ab..adc9750 100644
--- a/windows-x86_64/lib/libgmodule-2.0.a
+++ b/windows-x86_64/lib/libgmodule-2.0.a
Binary files differ
diff --git a/windows-x86_64/lib/libgmodule-2.0.la b/windows-x86_64/lib/libgmodule-2.0.la
index a2b4fc1..c1b5da1 100755
--- a/windows-x86_64/lib/libgmodule-2.0.la
+++ b/windows-x86_64/lib/libgmodule-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib64 /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib64 /tmp/zyy-build-temp-120638/install-windows-x86_64/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86_64/lib'
diff --git a/windows-x86_64/lib/libgobject-2.0.a b/windows-x86_64/lib/libgobject-2.0.a
index eb175c5..eca73b2 100644
--- a/windows-x86_64/lib/libgobject-2.0.a
+++ b/windows-x86_64/lib/libgobject-2.0.a
Binary files differ
diff --git a/windows-x86_64/lib/libgobject-2.0.la b/windows-x86_64/lib/libgobject-2.0.la
index 60852f9..b994833 100755
--- a/windows-x86_64/lib/libgobject-2.0.la
+++ b/windows-x86_64/lib/libgobject-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib64 /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib/../lib/libffi.la'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib64 /tmp/zyy-build-temp-120638/install-windows-x86_64/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /tmp/zyy-build-temp-120638/install-windows-x86_64/lib/../lib/libffi.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86_64/lib'
diff --git a/windows-x86_64/lib/libgthread-2.0.a b/windows-x86_64/lib/libgthread-2.0.a
index acc8d8a..9e0f7db 100644
--- a/windows-x86_64/lib/libgthread-2.0.a
+++ b/windows-x86_64/lib/libgthread-2.0.a
Binary files differ
diff --git a/windows-x86_64/lib/libgthread-2.0.la b/windows-x86_64/lib/libgthread-2.0.la
index 010e4eb..e309b4a 100755
--- a/windows-x86_64/lib/libgthread-2.0.la
+++ b/windows-x86_64/lib/libgthread-2.0.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib64 /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib64 /tmp/zyy-build-temp-120638/install-windows-x86_64/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86_64/lib'
diff --git a/windows-x86_64/lib/libpixman-1.a b/windows-x86_64/lib/libpixman-1.a
index befeb6a..070b739 100644
--- a/windows-x86_64/lib/libpixman-1.a
+++ b/windows-x86_64/lib/libpixman-1.a
Binary files differ
diff --git a/windows-x86_64/lib/libpixman-1.la b/windows-x86_64/lib/libpixman-1.la
index 5446522..6e9e9f5 100755
--- a/windows-x86_64/lib/libpixman-1.la
+++ b/windows-x86_64/lib/libpixman-1.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86_64/lib'
diff --git a/windows-x86_64/lib/libpng16.a b/windows-x86_64/lib/libpng16.a
index 962942c..20a1329 100644
--- a/windows-x86_64/lib/libpng16.a
+++ b/windows-x86_64/lib/libpng16.a
Binary files differ
diff --git a/windows-x86_64/lib/libpng16.la b/windows-x86_64/lib/libpng16.la
index 44c02ef..a1f68c2 100755
--- a/windows-x86_64/lib/libpng16.la
+++ b/windows-x86_64/lib/libpng16.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib -lz'
+dependency_libs=' -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib'
+libdir='/tmp/zyy-build-temp-120638/install-windows-x86_64/lib'
diff --git a/windows-x86_64/lib/libz.a b/windows-x86_64/lib/libz.a
index 61db8e8..44c7386 100644
--- a/windows-x86_64/lib/libz.a
+++ b/windows-x86_64/lib/libz.a
Binary files differ
diff --git a/windows-x86_64/lib/pkgconfig/gio-2.0.pc b/windows-x86_64/lib/pkgconfig/gio-2.0.pc
index 0b91b29..1f109d8 100644
--- a/windows-x86_64/lib/pkgconfig/gio-2.0.pc
+++ b/windows-x86_64/lib/pkgconfig/gio-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
@@ -14,5 +14,5 @@
 Requires: glib-2.0 gobject-2.0
 Requires.private: gmodule-no-export-2.0
 Libs: -L${libdir} -lgio-2.0 -ldnsapi -liphlpapi
-Libs.private: -L/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib -lz   
+Libs.private: -L/tmp/zyy-build-temp-120638/install-windows-x86_64/lib -lz   
 Cflags:
diff --git a/windows-x86_64/lib/pkgconfig/gio-windows-2.0.pc b/windows-x86_64/lib/pkgconfig/gio-windows-2.0.pc
index a503df7..256cec6 100644
--- a/windows-x86_64/lib/pkgconfig/gio-windows-2.0.pc
+++ b/windows-x86_64/lib/pkgconfig/gio-windows-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86_64/lib/pkgconfig/glib-2.0.pc b/windows-x86_64/lib/pkgconfig/glib-2.0.pc
index 86f05ef..7a15b3c 100644
--- a/windows-x86_64/lib/pkgconfig/glib-2.0.pc
+++ b/windows-x86_64/lib/pkgconfig/glib-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86_64/lib/pkgconfig/gmodule-2.0.pc b/windows-x86_64/lib/pkgconfig/gmodule-2.0.pc
index 0c1f868..39e05c6 100644
--- a/windows-x86_64/lib/pkgconfig/gmodule-2.0.pc
+++ b/windows-x86_64/lib/pkgconfig/gmodule-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86_64/lib/pkgconfig/gmodule-export-2.0.pc b/windows-x86_64/lib/pkgconfig/gmodule-export-2.0.pc
index 0c1f868..39e05c6 100644
--- a/windows-x86_64/lib/pkgconfig/gmodule-export-2.0.pc
+++ b/windows-x86_64/lib/pkgconfig/gmodule-export-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86_64/lib/pkgconfig/gmodule-no-export-2.0.pc b/windows-x86_64/lib/pkgconfig/gmodule-no-export-2.0.pc
index 291686f..27f4c40 100644
--- a/windows-x86_64/lib/pkgconfig/gmodule-no-export-2.0.pc
+++ b/windows-x86_64/lib/pkgconfig/gmodule-no-export-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86_64/lib/pkgconfig/gobject-2.0.pc b/windows-x86_64/lib/pkgconfig/gobject-2.0.pc
index 03fd83f..985d633 100644
--- a/windows-x86_64/lib/pkgconfig/gobject-2.0.pc
+++ b/windows-x86_64/lib/pkgconfig/gobject-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
@@ -8,5 +8,5 @@
 Requires: glib-2.0
 Version: 2.38.2
 Libs: -L${libdir} -lgobject-2.0
-Libs.private: /usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib/libffi.la
+Libs.private: /tmp/zyy-build-temp-120638/install-windows-x86_64/lib/libffi.la
 Cflags:
diff --git a/windows-x86_64/lib/pkgconfig/gthread-2.0.pc b/windows-x86_64/lib/pkgconfig/gthread-2.0.pc
index 7e145f2..ae61c57 100644
--- a/windows-x86_64/lib/pkgconfig/gthread-2.0.pc
+++ b/windows-x86_64/lib/pkgconfig/gthread-2.0.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86_64/lib/pkgconfig/libffi.pc b/windows-x86_64/lib/pkgconfig/libffi.pc
index 3a1bf91..d721231 100644
--- a/windows-x86_64/lib/pkgconfig/libffi.pc
+++ b/windows-x86_64/lib/pkgconfig/libffi.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 toolexeclibdir=${exec_prefix}/lib/../lib
diff --git a/windows-x86_64/lib/pkgconfig/libpng16.pc b/windows-x86_64/lib/pkgconfig/libpng16.pc
index cfab17f..9729f31 100644
--- a/windows-x86_64/lib/pkgconfig/libpng16.pc
+++ b/windows-x86_64/lib/pkgconfig/libpng16.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include/libpng16
diff --git a/windows-x86_64/lib/pkgconfig/pixman-1.pc b/windows-x86_64/lib/pkgconfig/pixman-1.pc
index 3abe88c..c7a135b 100644
--- a/windows-x86_64/lib/pkgconfig/pixman-1.pc
+++ b/windows-x86_64/lib/pkgconfig/pixman-1.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86_64/lib/pkgconfig/sdl2.pc b/windows-x86_64/lib/pkgconfig/sdl2.pc
index e59a8bf..8ebfd56 100644
--- a/windows-x86_64/lib/pkgconfig/sdl2.pc
+++ b/windows-x86_64/lib/pkgconfig/sdl2.pc
@@ -1,6 +1,6 @@
 # sdl pkg-config source file
 
-prefix=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64
+prefix=/tmp/zyy-build-temp-120638/install-windows-x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/windows-x86_64/lib/pkgconfig/zlib.pc b/windows-x86_64/lib/pkgconfig/zlib.pc
index 5778a41..b754929 100644
--- a/windows-x86_64/lib/pkgconfig/zlib.pc
+++ b/windows-x86_64/lib/pkgconfig/zlib.pc
@@ -1,12 +1,12 @@
 prefix=/usr/local
 exec_prefix=/usr/local
-libdir=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib
-sharedlibdir=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/lib
-includedir=/usr/local/google/home/zyy/sources/emu-master-dev/external/qemu/bqad/install-windows-x86_64/include
+libdir=/tmp/zyy-build-temp-120638/install-windows-x86_64/lib
+sharedlibdir=/tmp/zyy-build-temp-120638/install-windows-x86_64/lib
+includedir=/tmp/zyy-build-temp-120638/install-windows-x86_64/include
 
 Name: zlib
 Description: zlib compression library
-Version: 1.2.8
+Version: 1.2.10
 
 Requires:
 Libs: -L${libdir} -L${sharedlibdir} -lz